summaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
authorAmerigo Wang <amwang@redhat.com>2011-05-19 23:39:11 +0200
committerDavid S. Miller <davem@davemloft.net>2011-05-23 03:01:19 +0200
commitbb8ed6302b0613339c1a5f0a2cb0b3807c0af611 (patch)
tree11fac5a62c192453f01cab4aedc81b0cdc91c900 /net/bridge
parentnetpoll: disable netpoll when enslave a device (diff)
downloadlinux-bb8ed6302b0613339c1a5f0a2cb0b3807c0af611.tar.xz
linux-bb8ed6302b0613339c1a5f0a2cb0b3807c0af611.zip
bridge: call NETDEV_JOIN notifiers when add a slave
In the previous patch I added NETDEV_JOIN, now we can notify netconsole when adding a device to a bridge too. Signed-off-by: WANG Cong <amwang@redhat.com> Cc: Neil Horman <nhorman@redhat.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, 2 insertions, 0 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 5dbdfdfc3a34..d5147ddd70bf 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -338,6 +338,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
if (IS_ERR(p))
return PTR_ERR(p);
+ call_netdevice_notifiers(NETDEV_JOIN, dev);
+
err = dev_set_promiscuity(dev, 1);
if (err)
goto put_back;