summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2010-05-26 10:34:51 -0700
committerBen Pfaff <blp@nicira.com>2010-05-26 15:36:58 -0700
commitbfb1f2d5cbb9ef82f2def2f41f5ff8a8f02b5bbc (patch)
tree8a437aaed6b23a87f9b6d0f0194eb2a8043ca883
parent7089685a9e9807d2c8bc37ec55e05142edddd7fa (diff)
downloadopenvswitch-bfb1f2d5cbb9ef82f2def2f41f5ff8a8f02b5bbc.tar.gz
proc-net-compat: Stub out on non-Linux.
/proc/net is Linux-specific, so there is no need to implement it on non-Linux systems.
-rw-r--r--vswitchd/ovs-vswitchd.8.in2
-rw-r--r--vswitchd/proc-net-compat.c26
2 files changed, 27 insertions, 1 deletions
diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
index 24c1c5d3d..0a7369e90 100644
--- a/vswitchd/ovs-vswitchd.8.in
+++ b/vswitchd/ovs-vswitchd.8.in
@@ -92,6 +92,8 @@ and \fB/proc/net/bonding\fR that some legacy software expects to
exist. This option should only be used if such legacy software is
actually in use. It requires the \fBbrcompat_mod.ko\fR kernel module
to be loaded.
+.IP
+On non-Linux hosts, this option is accepted but has no effect.
.
.so lib/daemon.man
.SS "Public Key Infrastructure Options"
diff --git a/vswitchd/proc-net-compat.c b/vswitchd/proc-net-compat.c
index 68ae1ac81..3b5c0ca92 100644
--- a/vswitchd/proc-net-compat.c
+++ b/vswitchd/proc-net-compat.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010 Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
#include <config.h>
#include "proc-net-compat.h"
+
+#ifdef HAVE_NETLINK
#include <assert.h>
#include <dirent.h>
#include <errno.h>
@@ -346,3 +348,25 @@ update_vlan_config(void)
set_proc_file("net/vlan", "config", ds_cstr(&ds));
ds_destroy(&ds);
}
+#else /* !HAVE_NETLINK */
+#include "compiler.h"
+
+int
+proc_net_compat_init(void)
+{
+ return 0;
+}
+
+void
+proc_net_compat_update_bond(const char *name OVS_UNUSED,
+ const struct compat_bond *bond OVS_UNUSED)
+{
+}
+
+void
+proc_net_compat_update_vlan(const char *tagged_dev OVS_UNUSED,
+ const char *trunk_dev OVS_UNUSED,
+ int vid OVS_UNUSED)
+{
+}
+#endif /* !HAVE_NETLINK */