[Patch] bridge: call NETDEV_ENSLAVE notifiers when adding a slave
From: Amerigo Wang <hidden>
Date: 2011-05-19 10:25:45
Also in:
bridge, lkml
Subsystem:
bonding driver, ethernet bridge, networking drivers, networking [general], the rest · Maintainers:
Jay Vosburgh, Nikolay Aleksandrov, Ido Schimmel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
In the previous patch I added NETDEV_ENSLAVE, now we can notify netconsole when adding a device to a bridge too. By the way, s/netdev_bonding_change/call_netdevice_notifiers/ in bond_main.c, since this is not bonding specific. Signed-off-by: WANG Cong <redacted> Cc: Neil Horman <redacted> --- drivers/net/bonding/bond_main.c | 2 +- net/bridge/br_if.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b9c70c5..765fdcf 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c@@ -1640,7 +1640,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) } } - netdev_bonding_change(slave_dev, NETDEV_ENSLAVE); + call_netdevice_notifiers(NETDEV_ENSLAVE, slave_dev); /* If this is the first slave, then we need to set the master's hardware * address to be the same as the slave's. */
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 5dbdfdf..b44fae5 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_ENSLAVE, dev); + err = dev_set_promiscuity(dev, 1); if (err) goto put_back;