diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-03-24 14:24:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-28 08:35:02 +0200 |
| commit | edf947f10074fea27fdb1730524dca59355a1c40 (patch) | |
| tree | 4141cd2fa39ae589055057e912d3235150d670c5 /net/bridge/br_stp_if.c | |
| parent | ipv4: Fix IP timestamp option (IPOPT_TS_PRESPEC) handling in ip_options_echo() (diff) | |
| download | linux-edf947f10074fea27fdb1730524dca59355a1c40.tar.xz linux-edf947f10074fea27fdb1730524dca59355a1c40.zip | |
bridge: notify applications if address of bridge device changes
The mac address of the bridge device may be changed when a new interface
is added to the bridge. If this happens, then the bridge needs to call
the network notifiers to tickle any other systems that care. Since bridge
can be a module, this also means exporting the notifier function.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_stp_if.c')
| -rw-r--r-- | net/bridge/br_stp_if.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c index 79372d4a4055..5593f5aec942 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c @@ -204,7 +204,7 @@ void br_stp_change_bridge_id(struct net_bridge *br, const unsigned char *addr) static const unsigned short br_mac_zero_aligned[ETH_ALEN >> 1]; /* called under bridge lock */ -void br_stp_recalculate_bridge_id(struct net_bridge *br) +bool br_stp_recalculate_bridge_id(struct net_bridge *br) { const unsigned char *br_mac_zero = (const unsigned char *)br_mac_zero_aligned; @@ -222,8 +222,11 @@ void br_stp_recalculate_bridge_id(struct net_bridge *br) } - if (compare_ether_addr(br->bridge_id.addr, addr)) - br_stp_change_bridge_id(br, addr); + if (compare_ether_addr(br->bridge_id.addr, addr) == 0) + return false; /* no change */ + + br_stp_change_bridge_id(br, addr); + return true; } /* called under bridge lock */ |