bonding: make TX_QUEUE_OVERRIDE() macro an inline function

Also, make it accept bonding as a parameter and change the name a bit to
better reflect its scope.

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>

2 files changed, 9 insertions, 8 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 90ebed6b3df6..5c88c11a3ddd 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3788,10 +3788,9 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev
 {
         struct bonding *bond = netdev_priv(dev);
 
-        if (TX_QUEUE_OVERRIDE(bond->params.mode)) {
-                if (!bond_slave_override(bond, skb))
-                        return NETDEV_TX_OK;
-        }
+        if (bond_should_override_tx_queue(bond) &&
+            !bond_slave_override(bond, skb))
+                return NETDEV_TX_OK;
 
         switch (bond->params.mode) {
         case BOND_MODE_ROUNDROBIN:
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 16e57a14e58c..dca3dfdf42d3 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -65,10 +65,6 @@
                  ((mode) == BOND_MODE_TLB)      ||      \
                  ((mode) == BOND_MODE_ALB))
 
-#define TX_QUEUE_OVERRIDE(mode)                         \
-                        (((mode) == BOND_MODE_ACTIVEBACKUP) ||  \
-                         ((mode) == BOND_MODE_ROUNDROBIN))
-
 #define IS_IP_TARGET_UNUSABLE_ADDRESS(a)        \
         ((htonl(INADDR_BROADCAST) == a) ||      \
          ipv4_is_zeronet(a))
@@ -284,6 +280,12 @@ static inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
         return slave->bond;
 }
 
+static inline bool bond_should_override_tx_queue(struct bonding *bond)
+{
+        return bond->params.mode == BOND_MODE_ACTIVEBACKUP ||
+               bond->params.mode == BOND_MODE_ROUNDROBIN;
+}
+
 static inline bool bond_is_lb(const struct bonding *bond)
 {
         return bond->params.mode == BOND_MODE_TLB ||