aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-01-03 15:28:05 -0800
committerChris Wright <chrisw@sous-sol.org>2006-01-14 22:15:26 -0800
commitb43a04de4c0807dbaf5934e7f72c004f4853c4e8 (patch)
treefdaa8412aac0bcdf322e5f8a3d802606c4e9cc08
parent88026842b0a760145aa71d69e74fbc9ec118ca44 (diff)
downloadlinux-linaro-stable-b43a04de4c0807dbaf5934e7f72c004f4853c4e8.tar.gz
[PATCH] BRIDGE: Fix faulty check in br_stp_recalculate_bridge_id()
There is a regression in 2.6.15. One of the conversions from memcmp to compare_ether_addr is incorrect. We need to do relative comparison to determine min MAC address to use in bridge id. This will cause the wrong bridge id to be chosen 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/bridge/br_stp_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index ac09b6a23523..491f49d72750 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -158,7 +158,7 @@ void br_stp_recalculate_bridge_id(struct net_bridge *br)
list_for_each_entry(p, &br->port_list, list) {
if (addr == br_mac_zero ||
- compare_ether_addr(p->dev->dev_addr, addr) < 0)
+ memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
addr = p->dev->dev_addr;
}