diff --git a/[refs] b/[refs] index b32badf78389..24ace3089875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0683e31ad5d9b4cab3cc32d033269e8cf675823a +refs/heads/master: 9ff76c951c5194d44a7cdce51d807d67fc3ae514 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index ecbe206f90d1..6b9a7bd8ec14 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -2082,7 +2082,6 @@ static int bond_release_all(struct net_device *bond_dev) struct net_device *slave_dev; struct sockaddr addr; - block_netpoll_tx(); write_lock_bh(&bond->lock); netif_carrier_off(bond_dev); @@ -2181,8 +2180,6 @@ static int bond_release_all(struct net_device *bond_dev) out: write_unlock_bh(&bond->lock); - unblock_netpoll_tx(); - return 0; }