diff options
| author | Veaceslav Falico <vfalico@redhat.com> | 2013-03-06 07:10:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-07 16:15:18 -0500 |
| commit | 80028ea1c0afc24d4ddeb8dd2a9992fff03616ca (patch) | |
| tree | c981945f06c8d6a658964961a11688444b544fca /drivers/net | |
| parent | 9cb6cb7ed11cd3b69c47bb414983603a6ff20b1d (diff) | |
| download | blackbird-op-linux-80028ea1c0afc24d4ddeb8dd2a9992fff03616ca.tar.gz blackbird-op-linux-80028ea1c0afc24d4ddeb8dd2a9992fff03616ca.zip | |
bonding: fire NETDEV_RELEASE event only on 0 slaves
Currently, if we set up netconsole over bonding and release a slave,
netconsole will stop logging on the whole bonding device. Change the
behavior to stop the netconsole only when the last slave is released.
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 7bd068a6056a..8b4e96e01d6c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1964,7 +1964,6 @@ static int __bond_release_one(struct net_device *bond_dev, } block_netpoll_tx(); - call_netdevice_notifiers(NETDEV_RELEASE, bond_dev); write_lock_bh(&bond->lock); slave = bond_get_slave_by_dev(bond, slave_dev); @@ -2066,8 +2065,10 @@ static int __bond_release_one(struct net_device *bond_dev, write_unlock_bh(&bond->lock); unblock_netpoll_tx(); - if (bond->slave_cnt == 0) + if (bond->slave_cnt == 0) { call_netdevice_notifiers(NETDEV_CHANGEADDR, bond->dev); + call_netdevice_notifiers(NETDEV_RELEASE, bond->dev); + } bond_compute_features(bond); if (!(bond_dev->features & NETIF_F_VLAN_CHALLENGED) && |
