diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-31 07:45:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-31 07:45:01 +0300 |
| commit | 06fb4e701b17e93366542e4cc57047e411136af7 (patch) | |
| tree | e68d4bce91bf3fa82f6a76c424d1d18d222d6638 /drivers/net/bonding | |
| parent | 2573d78872f242a05b842e9c553da45a3d9924e5 (diff) | |
| parent | f892a84cc890aaaba7bc42daf2e2ee86b0961884 (diff) | |
| download | linux-06fb4e701b17e93366542e4cc57047e411136af7.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0ef2ed3a610e..06e2d01f0b4e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -979,7 +979,6 @@ static void bond_poll_controller(struct net_device *bond_dev) if (bond_3ad_get_active_agg_info(bond, &ad_info)) return; - rcu_read_lock_bh(); bond_for_each_slave_rcu(bond, slave, iter) { ops = slave->dev->netdev_ops; if (!bond_slave_is_up(slave) || !ops->ndo_poll_controller) @@ -1000,7 +999,6 @@ static void bond_poll_controller(struct net_device *bond_dev) ops->ndo_poll_controller(slave->dev); up(&ni->dev_lock); } - rcu_read_unlock_bh(); } static void bond_netpoll_cleanup(struct net_device *bond_dev) |