aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVeaceslav Falico <vfalico@gmail.com>2014-05-15 15:39:51 -0400
committerDavid S. Miller <davem@davemloft.net>2014-05-16 16:34:31 -0400
commitbefb903ae64ad09ba7e4aabb6e1707896c7c5d56 (patch)
tree3a8b6c890f4f99f3efdf5034686068e322e2af3c
parent31ff6aa5c86f7564f0dd97c5b3e1404cad238d00 (diff)
bonding: remove BOND_MODE_IS_LB macro
It's used only in an inline function and is useless. 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>
-rw-r--r--drivers/net/bonding/bonding.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index c51c433bc96e..16e57a14e58c 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -69,10 +69,6 @@
69 (((mode) == BOND_MODE_ACTIVEBACKUP) || \ 69 (((mode) == BOND_MODE_ACTIVEBACKUP) || \
70 ((mode) == BOND_MODE_ROUNDROBIN)) 70 ((mode) == BOND_MODE_ROUNDROBIN))
71 71
72#define BOND_MODE_IS_LB(mode) \
73 (((mode) == BOND_MODE_TLB) || \
74 ((mode) == BOND_MODE_ALB))
75
76#define IS_IP_TARGET_UNUSABLE_ADDRESS(a) \ 72#define IS_IP_TARGET_UNUSABLE_ADDRESS(a) \
77 ((htonl(INADDR_BROADCAST) == a) || \ 73 ((htonl(INADDR_BROADCAST) == a) || \
78 ipv4_is_zeronet(a)) 74 ipv4_is_zeronet(a))
@@ -290,7 +286,8 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
290 286
291static inline bool bond_is_lb(const struct bonding *bond) 287static inline bool bond_is_lb(const struct bonding *bond)
292{ 288{
293 return BOND_MODE_IS_LB(bond->params.mode); 289 return bond->params.mode == BOND_MODE_TLB ||
290 bond->params.mode == BOND_MODE_ALB;
294} 291}
295 292
296static inline void bond_set_active_slave(struct slave *slave) 293static inline void bond_set_active_slave(struct slave *slave)