]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[BRIDGE]: Fix faulty check in br_stp_recalculate_bridge_id()
authorStephen Hemminger <shemminger@osdl.org>
Tue, 3 Jan 2006 22:35:54 +0000 (14:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Jan 2006 22:35:54 +0000 (14:35 -0800)
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.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_stp_if.c

index 2d2e969ae25de49f1f59d7e7dc5cafdd6a2318ea..cc047f7fb6efc9c4deb42d6aab17f48a778d0474 100644 (file)
@@ -157,7 +157,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;
 
        }