From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 18 May 2010 19:26:27 +0000 (-0700)
Subject: bridge: fix build for CONFIG_SYSFS disabled
X-Git-Tag: v2.6.35-rc1~473^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4;p=platform%2Fkernel%2Flinux-3.10.git

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>
---

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index f25e3c9..18b245e 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);