diff options
| author | Veaceslav Falico <vfalico@gmail.com> | 2014-05-15 21:39:59 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-16 22:34:33 +0200 |
| commit | 8557cd74ca8af9a71ae19d445e33d92bd50a6dc5 (patch) | |
| tree | c6ad54191e3ed0afc12f62cd5f546189058ec096 /drivers/net/bonding/bonding.h | |
| parent | bonding: rename {, bond_}slave_can_tx and clean it up (diff) | |
| download | linux-8557cd74ca8af9a71ae19d445e33d92bd50a6dc5.tar.xz linux-8557cd74ca8af9a71ae19d445e33d92bd50a6dc5.zip | |
bonding: replace SLAVE_IS_OK() with bond_slave_can_tx()
They're verifying the same thing (except of IFF_UP, which is implied for
netif_running(), which is also a prerequisite).
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
| -rw-r--r-- | drivers/net/bonding/bonding.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 60ffd57cf625..44334b3d3b88 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -41,15 +41,6 @@ #define BOND_DEFAULT_MIIMON 100 /* - * Checks whether slave is ready for transmit. - */ -#define SLAVE_IS_OK(slave) \ - (((slave)->dev->flags & IFF_UP) && \ - netif_running((slave)->dev) && \ - ((slave)->link == BOND_LINK_UP) && \ - bond_is_active_slave(slave)) - -/* * Less bad way to call ioctl from within the kernel; this needs to be * done some other way to get the call out of interrupt context. * Needs "ioctl" variable to be supplied by calling context. |