From fe91909bcd18ea954fe80f94e3db0134c60429a4 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 18 May 2010 12:26:27 -0700
Subject: [PATCH] --- yaml --- r: 195286 b: refs/heads/master c:
 b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/bridge/br_if.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b057af3f4c05..c7b61ebb109b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7971c80a8e0299f91272ad8e8ac4167623e1862
+refs/heads/master: b3bcb72edb29c52fb0a065d5b1c7cf40ed9287f4
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
index f25e3c92bd72..18b245e2c00e 100644
--- a/trunk/net/bridge/br_if.c
+++ b/trunk/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);