summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorstephen hemminger <shemminger@vyatta.com>2011-07-22 07:47:08 +0000
committerDavid S. Miller <davem@davemloft.net>2011-07-22 17:01:12 -0700
commit56139fc5bd6e740706993ab3ad0d0aeff69a8479 (patch)
tree65ce11b7198f8cbece5e8ccd05bfb47b4e0fc0af /net/bridge
parent0652cac22ce3fa0c90e35d0a2862969fc394cb02 (diff)
downloadlinux-3.10-56139fc5bd6e740706993ab3ad0d0aeff69a8479.tar.gz
linux-3.10-56139fc5bd6e740706993ab3ad0d0aeff69a8479.tar.bz2
linux-3.10-56139fc5bd6e740706993ab3ad0d0aeff69a8479.zip
bridge: notifier called with the wrong device
If a new device is added to a bridge, the ethernet address of the bridge network device may change. When the address changes, the appropriate callback is called, but with the wrong device argument. The address of the bridge device (ie br0) changes not the address of the device being passed to add_if (ie eth0). Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_if.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 1bacca4cb67..3176e2e13d9 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -388,7 +388,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
br_ifinfo_notify(RTM_NEWLINK, p);
if (changed_addr)
- call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);
+ call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);
dev_set_mtu(br->dev, br_min_mtu(br));