From a58b50ff41f7a18fbfa8598bf6b0f7422728ceeb Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Tue, 3 Jan 2006 14:35:54 -0800
Subject: [PATCH] --- yaml --- r: 15584 b: refs/heads/master c:
 554c9a8ec37729bff69951cb740074abbae21afa h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/bridge/br_stp_if.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec541c220103..17822149d128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e84a9f5e9cd2b229dda24002334bc3cd36c1109d
+refs/heads/master: 554c9a8ec37729bff69951cb740074abbae21afa
diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
index 2d2e969ae25d..cc047f7fb6ef 100644
--- a/trunk/net/bridge/br_stp_if.c
+++ b/trunk/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;
 
 	}