diff options
| author | stephen hemminger <shemminger@vyatta.com> | 2011-12-08 07:17:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-08 19:40:28 -0500 |
| commit | 43598813386f6205edf3c21f1fe97f731ccb4f15 (patch) | |
| tree | e08befb899b76681fac2af8acb13150b0b74d44f /net/bridge/br_device.c | |
| parent | 31e8a49c161b00c648e960903512c9cbaee777b1 (diff) | |
| download | blackbird-op-linux-43598813386f6205edf3c21f1fe97f731ccb4f15.tar.gz blackbird-op-linux-43598813386f6205edf3c21f1fe97f731ccb4f15.zip | |
bridge: add local MAC address to forwarding table (v2)
If user has configured a MAC address that is not one of the existing
ports of the bridge, then we need to add a special entry in the forwarding
table. This forwarding table entry has no outgoing port so it has to be
treated a little differently. The special entry is reported by the netlink
interface with ifindex of bridge, but ignored by the old interface since there
is no usable way to put it in the ABI.
Reported-by: Koki Sanagi <sanagi.koki@jp.fujitsu.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index a3754ac262c3..71773b014e0c 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -170,8 +170,11 @@ static int br_set_mac_address(struct net_device *dev, void *p) return -EINVAL; spin_lock_bh(&br->lock); - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); - br_stp_change_bridge_id(br, addr->sa_data); + if (compare_ether_addr(dev->dev_addr, addr->sa_data)) { + memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + br_fdb_change_mac_address(br, addr->sa_data); + br_stp_change_bridge_id(br, addr->sa_data); + } br->flags |= BR_SET_MAC_ADDR; spin_unlock_bh(&br->lock); |
