From ecafd19b8b97b957e371b4ee8736ebeed75593f9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 12 Dec 2005 22:55:44 -0800 Subject: [PATCH] oops, forgot to add back in the 2.6.13 review files... --- .../br-fix-race-on-bridge-del-if.patch | 41 +++++++++++++++++++ review-2.6.13/series | 2 + review-2.6.13/sparc64-build-fix.patch | 30 ++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 review-2.6.13/br-fix-race-on-bridge-del-if.patch create mode 100644 review-2.6.13/series create mode 100644 review-2.6.13/sparc64-build-fix.patch diff --git a/review-2.6.13/br-fix-race-on-bridge-del-if.patch b/review-2.6.13/br-fix-race-on-bridge-del-if.patch new file mode 100644 index 00000000000..3f3a6968077 --- /dev/null +++ b/review-2.6.13/br-fix-race-on-bridge-del-if.patch @@ -0,0 +1,41 @@ +From shemminger@osdl.org Tue Oct 11 13:37:00 2005 +Date: Tue, 11 Oct 2005 13:33:28 -0700 +From: Stephen Hemminger +To: Ryan Harper , "David S. Miller" +Cc: netdev@oss.sgi.com, Chris Wright , Greg KH +Subject: [PATCH] br: 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. If there is another +2.6.13-stable, add it as well. + +Signed-off-by: Stephen Hemminger +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + net/bridge/br_if.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- linux-2.6.13.4.orig/net/bridge/br_if.c ++++ linux-2.6.13.4/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); diff --git a/review-2.6.13/series b/review-2.6.13/series new file mode 100644 index 00000000000..79f17108d92 --- /dev/null +++ b/review-2.6.13/series @@ -0,0 +1,2 @@ +sparc64-build-fix.patch +br-fix-race-on-bridge-del-if.patch diff --git a/review-2.6.13/sparc64-build-fix.patch b/review-2.6.13/sparc64-build-fix.patch new file mode 100644 index 00000000000..df473209090 --- /dev/null +++ b/review-2.6.13/sparc64-build-fix.patch @@ -0,0 +1,30 @@ +From stable-bounces@linux.kernel.org Sat Oct 8 21:14:33 2005 +Date: Sat, 08 Oct 2005 21:14:34 -0700 (PDT) +To: stable@kernel.org +From: "David S. Miller" +Cc: +Subject: [SPARC64]: Fix compile error in irq.c + +From: Sven Hartge + +irq.c is missing the inclusion of asm/io.h, which causes +readb() and writeb() the be undefined. + +Signed-off-by: Sven Hartge +Signed-off-by: David S. Miller +Signed-off-by: Chris Wright +Signed-off-by: Greg Kroah-Hartman +--- + arch/sparc64/kernel/irq.c | 1 + + 1 file changed, 1 insertion(+) + +--- linux-2.6.13.4.orig/arch/sparc64/kernel/irq.c ++++ linux-2.6.13.4/arch/sparc64/kernel/irq.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + #include -- 2.47.3