refresh and sign off on bridge fix from shemminger

diff --git a/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch b/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch
index 14e10412dca122cd8b1565f1d67aa680a77e12dd..4e40c0d3bd0a611d4e70cd5e0c6d1d3a16ac1bbe 100644 (file)
--- a/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch
+++ b/queue/bridge-fix-faulty-check-in-br_stp_recalculate_bridge_id.patch
@@ -14,9 +14,16 @@ which violates 802.1d Spanning Tree Protocol, and may create forwarding
 loops.
 
 Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
 
---- linux-2.6.15.orig/net/bridge/br_stp_if.c
-+++ linux-2.6.15/net/bridge/br_stp_if.c
+ net/bridge/br_stp_if.c |    2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+Index: linux-2.6.15.y/net/bridge/br_stp_if.c
+===================================================================
+--- linux-2.6.15.y.orig/net/bridge/br_stp_if.c
++++ linux-2.6.15.y/net/bridge/br_stp_if.c
 @@ -158,7 +158,7 @@ void br_stp_recalculate_bridge_id(struct
  
        list_for_each_entry(p, &br->port_list, list) {
@@ -26,14 +33,3 @@ Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
                        addr = p->dev->dev_addr;
  
        }
--
-
--- 
-Stephen Hemminger <shemminger@osdl.org>
-OSDL http://developer.osdl.org/~shemminger
-
-_______________________________________________
-stable mailing list
-stable@linux.kernel.org
-http://linux.kernel.org/mailman/listinfo/stable
-