From: Veaceslav Falico Date: Fri, 27 Sep 2013 14:12:05 +0000 (+0200) Subject: bonding: remove bond_next_slave() X-Git-Tag: v3.13-rc1~105^2~281 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4aa0a03f519812f48ac48d046bc451e97649ec82;p=~emulex%2Finfiniband.git bonding: remove bond_next_slave() There are no users left, so it's safe to remove. CC: Jay Vosburgh CC: Andy Gospodarek Signed-off-by: Veaceslav Falico Signed-off-by: David S. Miller --- diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 5b71601666c..713b6af555c 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -89,9 +89,6 @@ #define bond_is_first_slave(bond, pos) (pos == bond_first_slave(bond)) #define bond_is_last_slave(bond, pos) (pos == bond_last_slave(bond)) -/* Since bond_first/last_slave can return NULL, these can return NULL too */ -#define bond_next_slave(bond, pos) __bond_next_slave(bond, pos) - /** * bond_for_each_slave - iterate over all slaves * @bond: the bond holding this list @@ -243,34 +240,6 @@ struct bonding { #define bond_slave_get_rtnl(dev) \ ((struct slave *) rtnl_dereference(dev->rx_handler_data)) -/** - * __bond_next_slave - get the next slave after the one provided - * @bond - bonding struct - * @slave - the slave provided - * - * Returns the next slave after the slave provided, first slave if the - * slave provided is the last slave and NULL if slave is not found - */ -static inline struct slave *__bond_next_slave(struct bonding *bond, - struct slave *slave) -{ - struct slave *slave_iter; - struct list_head *iter; - bool found = false; - - netdev_for_each_lower_private(bond->dev, slave_iter, iter) { - if (found) - return slave_iter; - if (slave_iter == slave) - found = true; - } - - if (found) - return bond_first_slave(bond); - - return NULL; -} - /** * Returns NULL if the net_device does not belong to any of the bond's slaves *