From bfb1f2d5cbb9ef82f2def2f41f5ff8a8f02b5bbc Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 26 May 2010 10:34:51 -0700 Subject: [PATCH] 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. --- vswitchd/ovs-vswitchd.8.in | 2 ++ vswitchd/proc-net-compat.c | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in index 24c1c5d3..0a7369e9 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 68ae1ac8..3b5c0ca9 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 #include "proc-net-compat.h" + +#ifdef HAVE_NETLINK #include #include #include @@ -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 */ -- 2.30.2