bonding: fire NETDEV_RELEASE event only on 0 slaves
Subsystems (3)
PATCH 1/1 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.
--- drivers/net/bonding/bond_main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +3 -2
@@ -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) &&
Signature · 1 line
1.7.1
Quoted 37 lines · Veaceslav Falico
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 <[email protected]>--- drivers/net/bonding/bond_main.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)drivers/net/bonding/bond_main.c +3
-2@@ -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) &&Signature · 1 line
1.7.1
From: Neil Horman <[email protected]>
Date: Wed, 6 Mar 2013 22:38:19 -0500
Quoted 6 lines · Veaceslav Falico
Quoted 5 lines
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 <[email protected]>
...
Quoted 1 line
Acked-by Neil Horman <[email protected]>
Applied, thanks everyone.