summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-05-18 12:26:27 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-18 12:26:27 -0700
commitb3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4 (patch)
tree4320495c0712e00230391404585a7cb26ba21985 /net/bridge
parente7971c80a8e0299f91272ad8e8ac4167623e1862 (diff)
downloadlinux-b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4.tar.gz
linux-b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4.tar.bz2
linux-b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4.zip
bridge: fix build for CONFIG_SYSFS disabled
Fix build when CONFIG_SYSFS is not enabled: net/bridge/br_if.c:136: error: 'struct net_bridge_port' has no member named 'sysfs_name' Note: dev->name == sysfs_name except when change name is in progress, and we are protected from that by RTNL mutex. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index f25e3c92bd72..18b245e2c00e 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -133,7 +133,7 @@ static void del_nbp(struct net_bridge_port *p)
struct net_bridge *br = p->br;
struct net_device *dev = p->dev;
- sysfs_remove_link(br->ifobj, p->sysfs_name);
+ sysfs_remove_link(br->ifobj, p->dev->name);
dev_set_promiscuity(dev, -1);