diff options
| author |   Veaceslav Falico <vfalico@redhat.com> | 2013-09-25 09:20:27 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-09-26 16:02:07 -0400 |
| commit | 344f3297629e409675120998d1cfe4d21c34fbaa (patch) | |
| tree | 0d02cf656ab430c9064f2d5b5ccdf2876d734a9d /drivers/net/bonding/bonding.h | |
| parent | bonding: add __bond_next_slave() which uses neighbours (diff) | |
| download | linux-dev-344f3297629e409675120998d1cfe4d21c34fbaa.tar.xz linux-dev-344f3297629e409675120998d1cfe4d21c34fbaa.zip | |
bonding: use neighbours for bond_next_slave()
Use the new function __bond_next_slave().
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 4a3fbe307ee8..f070557c21ea 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -76,8 +76,6 @@ #define bond_has_slaves(bond) !list_empty(bond_slave_list(bond)) -#define bond_to_slave(ptr) list_entry(ptr, struct slave, list) - /* IMPORTANT: bond_first/last_slave can return NULL in case of an empty list */ #define bond_first_slave(bond) \ (bond_has_slaves(bond) ? \ @@ -92,9 +90,7 @@ #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_is_last_slave(bond, pos) ? bond_first_slave(bond) : \ - bond_to_slave((pos)->list.next)) +#define bond_next_slave(bond, pos) __bond_next_slave(bond, pos) /** * bond_for_each_slave - iterate over all slaves |