[PATCH v2 net-next] bonding: use rtnl_deref in bond_change_rx_flags()

[PATCH v2 net-next] bonding: use rtnl_deref in bond_change_rx_flags()

[Veaceslav Falico]

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>
---

Notes:
    v1->v2:
    also remove the misleading comment

 drivers/net/bonding/bond_main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d643807..c4f8162 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -498,9 +498,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 {
@@ -524,9 +523,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 {
-- 
1.8.4

Re: [PATCH v2 net-next] bonding: use rtnl_deref in bond_change_rx_flags()

[David Miller]

From: Veaceslav Falico <vfalico@gmail.com>
Date: Wed, 16 Jul 2014 18:32:01 +0200

> 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>
> ---
> 
> Notes:
>     v1->v2:
>     also remove the misleading comment

Eric if this is fine with you now, please review and ack, thanks.

Re: [PATCH v2 net-next] bonding: use rtnl_deref in bond_change_rx_flags()

[Eric Dumazet]

On Wed, 2014-07-16 at 18:32 +0200, Veaceslav Falico wrote:
> 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>

Re: [PATCH v2 net-next] bonding: use rtnl_deref in bond_change_rx_flags()

[David Miller]

From: Veaceslav Falico <vfalico@gmail.com>
Date: Wed, 16 Jul 2014 18:32:01 +0200

> 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>
> ---
> 
> Notes:
>     v1->v2:
>     also remove the misleading comment

Applied, thank you.