| Message ID | 1380023227-9576-7-git-send-email-vfalico@redhat.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Veaceslav Falico <vfalico@redhat.com> Date: Tue, 24 Sep 2013 13:46:46 +0200 > - return NULL; > + return (struct slave *)netdev_lower_dev_get_private(bond->dev, > + slave_dev); > } void pointers never need to be cast, please remove this "struct slave *" cast. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Sep 24, 2013 at 03:19:43PM -0400, David Miller wrote: >From: Veaceslav Falico <vfalico@redhat.com> >Date: Tue, 24 Sep 2013 13:46:46 +0200 > >> - return NULL; >> + return (struct slave *)netdev_lower_dev_get_private(bond->dev, >> + slave_dev); >> } > >void pointers never need to be cast, please remove this "struct slave *" >cast. Yep, leftover from the sandbox versions, will change and submit the new version. Sorry about that :-/. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 03cf3fd..597a4ec 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -276,13 +276,8 @@ struct bonding { static inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev) { - struct slave *slave = NULL; - - bond_for_each_slave(bond, slave) - if (slave->dev == slave_dev) - return slave; - - return NULL; + return (struct slave *)netdev_lower_dev_get_private(bond->dev, + slave_dev); } static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
It should be used under rtnl/bonding lock, so use the non-RCU version. CC: Jay Vosburgh <fubar@us.ibm.com> CC: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Veaceslav Falico <vfalico@redhat.com> --- Notes: v3 -> v4: No change. v2 -> v3: No change. v1 -> v2: No changes. RFC -> v1: Move the patch right after we've populated ->private with bonding. drivers/net/bonding/bonding.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)