From: Chris Wright Date: Thu, 5 Jan 2006 02:47:37 +0000 (-0800) Subject: refresh and sign off on bridge fix from shemminger X-Git-Tag: v2.6.14.6~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75f554ccebb8787a8f1a5912c8f3fc506e44ae13;p=thirdparty%2Fkernel%2Fstable-queue.git 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 14e10412dca..4e40c0d3bd0 100644 --- 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 +Signed-off-by: Chris Wright +--- ---- 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 addr = p->dev->dev_addr; } -- - --- -Stephen Hemminger -OSDL http://developer.osdl.org/~shemminger - -_______________________________________________ -stable mailing list -stable@linux.kernel.org -http://linux.kernel.org/mailman/listinfo/stable -