r4438 - people/horms/patch_notes/misc

[Simon Horman]

Author: horms
Date: 2005-10-13 04:20:36 +0000 (Thu, 13 Oct 2005)
New Revision: 4438

Removed:
   people/horms/patch_notes/misc/br-del-race.patch
Log:
Bahh, its in chrisw's stable-queue anyway

Deleted: people/horms/patch_notes/misc/br-del-race.patch
===================================================================
--- people/horms/patch_notes/misc/br-del-race.patch	2005-10-13 04:16:57 UTC (rev 4437)
+++ people/horms/patch_notes/misc/br-del-race.patch	2005-10-13 04:20:36 UTC (rev 4438)
@@ -1,39 +0,0 @@
-commit ab4060e858e36129f9319ef0fa055347ad60e1d5
-tree c3d28036801fcab8529bd8ee977fafd755fb3da4
-parent eeb2b8560676e454ad37ee30b49bc7d897edc9be
-author Stephen Hemminger <shemminger at osdl.org> Wed, 12 Oct 2005 15:10:01 -0700
-committer David S. Miller <davem at davemloft.net> Wed, 12 Oct 2005 15:10:01 -0700
-
-    [BRIDGE]: fix race on bridge del if
-    
-    This fixes the RCU race on bridge delete interface.  Basically,
-    the network device has to be detached from the bridge in the first
-    step (pre-RCU), rather than later. At that point, no more bridge traffic
-    will come in, and the other code will not think that network device
-    is part of a bridge.
-    
-    This should also fix the XEN test problems.
-    
-    Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
-    Signed-off-by: David S. Miller <davem at davemloft.net>
-
-diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
-index 91bb895..defcf6a 100644
---- a/net/bridge/br_if.c
-+++ b/net/bridge/br_if.c
-@@ -79,7 +79,6 @@ static void destroy_nbp(struct net_bridg
- {
- 	struct net_device *dev = p->dev;
- 
--	dev->br_port = NULL;
- 	p->br = NULL;
- 	p->dev = NULL;
- 	dev_put(dev);
-@@ -100,6 +99,7 @@ static void del_nbp(struct net_bridge_po
- 	struct net_bridge *br = p->br;
- 	struct net_device *dev = p->dev;
- 
-+	dev->br_port = NULL;
- 	dev_set_promiscuity(dev, -1);
- 
- 	spin_lock_bh(&br->lock);