---

yaml --- r: 15584 b: refs/heads/master c: 554c9a8 h: refs/heads/master v: v3
git-mirror · Jan 3, 2006 · a58b50f · a58b50f
1 parent 3cb6798
commit a58b50f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
 
 	}