diff options
| author | Veaceslav Falico <vfalico@gmail.com> | 2014-07-16 18:32:01 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-17 16:06:52 -0700 |
| commit | 14056e7930761b730e2b34ae716e151ba890f3bf (patch) | |
| tree | 8a8323db360761f0f456861f66895b115177bcda /drivers/net/bonding | |
| parent | c104178dda67c9d8de763e0baa60a00d10d9a839 (diff) | |
| download | blackbird-op-linux-14056e7930761b730e2b34ae716e151ba890f3bf.tar.gz blackbird-op-linux-14056e7930761b730e2b34ae716e151ba890f3bf.zip | |
bonding: use rtnl_deref in bond_change_rx_flags()
As it's always called with RTNL held, via dev_set_allmulti/promiscuity.
Also, remove the wrong comment.
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index a2c4e8d4a955..5e5b3b30c51c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -496,9 +496,8 @@ static int bond_set_promiscuity(struct bonding *bond, int inc) int err = 0; if (bond_uses_primary(bond)) { - struct slave *curr_active = bond_deref_active_protected(bond); + struct slave *curr_active = rtnl_dereference(bond->curr_active_slave); - /* write lock already acquired */ if (curr_active) err = dev_set_promiscuity(curr_active->dev, inc); } else { @@ -522,9 +521,8 @@ static int bond_set_allmulti(struct bonding *bond, int inc) int err = 0; if (bond_uses_primary(bond)) { - struct slave *curr_active = bond_deref_active_protected(bond); + struct slave *curr_active = rtnl_dereference(bond->curr_active_slave); - /* write lock already acquired */ if (curr_active) err = dev_set_allmulti(curr_active->dev, inc); } else { |
