git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Add DEVTYPE support for Ethernet based devices
[safe/jmp/linux-2.6]
/
net
/
bridge
/
br_stp_if.c
diff --git
a/net/bridge/br_stp_if.c
b/net/bridge/br_stp_if.c
index
1a4e5c3
..
9a52ac5
100644
(file)
--- a/
net/bridge/br_stp_if.c
+++ b/
net/bridge/br_stp_if.c
@@
-214,6
+214,10
@@
void br_stp_recalculate_bridge_id(struct net_bridge *br)
const unsigned char *addr = br_mac_zero;
struct net_bridge_port *p;
const unsigned char *addr = br_mac_zero;
struct net_bridge_port *p;
+ /* user has chosen a value so keep it */
+ if (br->flags & BR_SET_MAC_ADDR)
+ return;
+
list_for_each_entry(p, &br->port_list, list) {
if (addr == br_mac_zero ||
memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)
list_for_each_entry(p, &br->port_list, list) {
if (addr == br_mac_zero ||
memcmp(p->dev->dev_addr, addr, ETH_ALEN) < 0)