---

yaml --- r: 195286 b: refs/heads/master c: b3bcb72 h: refs/heads/master v: v3
git-mirror · May 18, 2010 · fe91909 · fe91909
1 parent 39ce1e3
commit fe91909
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);