diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-01-03 17:35:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-03 17:35:54 -0500 |
| commit | 554c9a8ec37729bff69951cb740074abbae21afa (patch) | |
| tree | f327e7dfc005da2d6792896525f5269308503e0b | |
| parent | e84a9f5e9cd2b229dda24002334bc3cd36c1109d (diff) | |
[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>
| -rw-r--r-- | net/bridge/br_stp_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 2d2e969ae25d..cc047f7fb6ef 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) | |||
| 157 | 157 | ||
| 158 | list_for_each_entry(p, &br->port_list, list) { | 158 | list_for_each_entry(p, &br->port_list, list) { |
| 159 | if (addr == br_mac_zero || | 159 | if (addr == br_mac_zero || |
| 160 | compare_ether_addr(p->dev->dev_addr, addr) < 0) | 160 | memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0) |
| 161 | addr = p->dev->dev_addr; | 161 | addr = p->dev->dev_addr; |
| 162 | 162 | ||
| 163 | } | 163 | } |
