diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-02-11 13:16:28 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-02-11 13:48:24 -0800 |
| commit | 0b8b6f71d5621a726a3bf5aa1bbee27ed1f4a8fe (patch) | |
| tree | c57e0b119100f7ac67f5bf803a5fa5116ea9a691 /vswitchd/ovs-vswitchd.c | |
| parent | 27f5b7720ab3994f71c0aa53caf1a2682f0462fe (diff) | |
| download | openvswitch-0b8b6f71d5621a726a3bf5aa1bbee27ed1f4a8fe.tar.gz | |
Remove /proc/net compatibility support.
This feature was included only to allow Citrix QA to run some tests that
interacted directly with the bridge. This feature hasn't been turned on
for some time, so it should not be necessary any longer.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'vswitchd/ovs-vswitchd.c')
| -rw-r--r-- | vswitchd/ovs-vswitchd.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 2181e82e6..1303e0893 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -36,7 +36,6 @@ #include "netdev.h" #include "ovsdb-idl.h" #include "poll-loop.h" -#include "proc-net-compat.h" #include "process.h" #include "signals.h" #include "stream-ssl.h" @@ -117,7 +116,6 @@ parse_options(int argc, char *argv[]) enum { OPT_PEER_CA_CERT = UCHAR_MAX + 1, OPT_MLOCKALL, - OPT_FAKE_PROC_NET, VLOG_OPTION_ENUMS, LEAK_CHECKER_OPTION_ENUMS, OPT_BOOTSTRAP_CA_CERT, @@ -128,7 +126,6 @@ parse_options(int argc, char *argv[]) {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, {"mlockall", no_argument, 0, OPT_MLOCKALL}, - {"fake-proc-net", no_argument, 0, OPT_FAKE_PROC_NET}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, @@ -141,7 +138,6 @@ parse_options(int argc, char *argv[]) {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); - int error; for (;;) { int c; @@ -170,14 +166,6 @@ parse_options(int argc, char *argv[]) #endif break; - case OPT_FAKE_PROC_NET: - error = proc_net_compat_init(); - if (error) { - ovs_fatal(error, "failed to initialize /proc/net " - "compatibility"); - } - break; - VLOG_OPTION_HANDLERS DAEMON_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS @@ -228,9 +216,7 @@ usage(void) stream_usage("DATABASE", true, false, true); daemon_usage(); vlog_usage(); - printf("\nLegacy compatibility options:\n" - " --fake-proc-net simulate some files in /proc/net\n" - "\nOther options:\n" + printf("\nOther options:\n" " -h, --help display this help message\n" " -V, --version display version information\n"); leak_checker_usage(); |