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