From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 3 Jan 2006 22:35:54 +0000 (-0800)
Subject: [BRIDGE]: Fix faulty check in br_stp_recalculate_bridge_id()
X-Git-Tag: v2.6.16-rc1~474^2~22^2~9^2~13
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=554c9a8ec37729bff69951cb740074abbae21afa;p=linux-2.6

[BRIDGE]: Fix faulty check in br_stp_recalculate_bridge_id()

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>
---

diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index 2d2e969ae2..cc047f7fb6 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c
@@ -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;
 
 	}