r4437 - people/horms/patch_notes/misc

Thu Oct 13 04:16:57 UTC 2005

Author: horms
Date: 2005-10-13 04:16:57 +0000 (Thu, 13 Oct 2005)
New Revision: 4437

Modified:
   people/horms/patch_notes/misc/br-del-race.patch
Log:
Patch from git rather than email

Modified: people/horms/patch_notes/misc/br-del-race.patch
===================================================================

--- people/horms/patch_notes/misc/br-del-race.patch	2005-10-13 04:16:33 UTC (rev 4436)
+++ people/horms/patch_notes/misc/br-del-race.patch	2005-10-13 04:16:57 UTC (rev 4437)
@@ -1,80 +1,26 @@
-From horms  Wed Oct 12 10:51:43 2005
-Received: from mail.au.vergenet.net [203.222.130.46]
-	by localhost with POP3 (fetchmail-6.2.5)
-	for horms at localhost (single-drop); Wed, 12 Oct 2005 10:51:43 +0900 (JST)
-Received: by stephanie (mbox horms)
- (with Cubic Circle's cucipop (v1.31 1998/05/13) Wed Oct 12 11:51:55 2005)
-X-From_: netdev-bounce at oss.sgi.com  Wed Oct 12 06:40:51 2005
-Return-Path: <netdev-bounce at oss.sgi.com>
-Received: from oss.sgi.com (oss.sgi.com [192.48.159.27])
-	by stephanie.vergenet.net (8.12.3/8.12.3) with ESMTP id j9BKeoxx025982
-	for <horms at verge.net.au>; Wed, 12 Oct 2005 06:40:51 +1000
-Received: from oss (localhost [127.0.0.1])
-	by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id j9BKhSO0028629;
-	Tue, 11 Oct 2005 13:43:29 -0700
-Received: with ECARTIS (v1.0.0; list netdev); Tue, 11 Oct 2005 13:40:33 -0700 (PDT)
-Received: from smtp.osdl.org (smtp.osdl.org [65.172.181.4])
-	by oss.sgi.com (8.12.10/8.12.10/SuSE Linux 0.7) with ESMTP id j9BKeHO0028076
-	for <netdev at oss.sgi.com>; Tue, 11 Oct 2005 13:40:19 -0700
-Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6])
-	by smtp.osdl.org (8.12.8/8.12.8) with ESMTP id j9BKb04s000738
-	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO);
-	Tue, 11 Oct 2005 13:37:01 -0700
-Received: from localhost.localdomain (dxpl.pdx.osdl.net [10.8.0.74])
-	by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id j9BKb0dT026134;
-	Tue, 11 Oct 2005 13:37:00 -0700
-Date: Tue, 11 Oct 2005 13:33:28 -0700
-From: Stephen Hemminger <shemminger at osdl.org>
-To: Ryan Harper <ryanh at us.ibm.com>, "David S. Miller" <davem at davemloft.net>
-Cc: netdev at oss.sgi.com, Chris Wright <chrisw at osdl.org>,
-   Greg KH
- <greg at kroah.com>
-Subject: [PATCH] br: fix race on bridge del if
-Message-ID: <20051011133328.26db65d7 at localhost.localdomain>
-In-Reply-To: <20050818214036.GH10593 at us.ibm.com>
-References: <20050818214036.GH10593 at us.ibm.com>
-X-Mailer: Sylpheed-Claws 1.9.14 (GTK+ 2.6.10; x86_64-redhat-linux-gnu)
-Mime-Version: 1.0
-Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-X-MIMEDefang-Filter: osdl$Revision: 1.123 $
-X-Scanned-By: MIMEDefang 2.36
-X-archive-position: 3741
-X-ecartis-version: Ecartis v1.0.0
-Sender: netdev-bounce at oss.sgi.com
-Errors-to: netdev-bounce at oss.sgi.com
-X-original-sender: shemminger at osdl.org
-Precedence: bulk
-X-list: netdev
-X-Virus-Scanned: ClamAV 0.83/1023/Mon Aug 15 13:15:08 2005 on oss.sgi.com
-X-Virus-Status: Clean
-X-Spam-Checker-Version: SpamAssassin 3.0.4-stephanie.vergenet.net_2005051000 
-	(2005-06-05) on stephanie
-X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham 
-	version=3.0.4-stephanie.vergenet.net_2005051000
-X-Spam-Level: 
-X-Loop: oathstix_mailinglist by stephanie; Wed, 12 Oct 2005 06:40:59 +1000
-X-Loop: oathstix_finish by stephanie; Wed, 12 Oct 2005 06:40:59 +1000
-X-Loop: oathstix_finish by tabatha.lab.ultramonkey.org; Wed, 12 Oct 2005 10:51:43 +0900
-Status: RO
-Content-Length: 1015
-Lines: 31
+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
 
-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.
+    [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>
 
-This should also fix the XEN test problems. If there is another
-2.6.13-stable, add it as well.
-
-Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
-
-Index: nexgate-test/net/bridge/br_if.c
-===================================================================
---- nexgate-test.orig/net/bridge/br_if.c
-+++ nexgate-test/net/bridge/br_if.c
+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;


