diff mbox

[net-next,2/5] bonding: rename {,BOND}_TX_QUEUE_OVERRIDE and make it accept bond struct

Message ID 1400072064-26095-3-git-send-email-vfalico@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Veaceslav Falico May 14, 2014, 12:54 p.m. UTC 
From: Veaceslav Falico <vfalico@redhat.com>

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
 drivers/net/bonding/bond_main.c | 2 +-
 drivers/net/bonding/bonding.h   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e6f1d02..4068c98 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3758,7 +3758,7 @@  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_TX_QUEUE_OVERRIDE(bond)) {
 		if (!bond_slave_override(bond, skb))
 			return NETDEV_TX_OK;
 	}
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 29ddce5..28c20c5 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -65,9 +65,9 @@ 
 		 ((mode) == BOND_MODE_TLB)	||	\
 		 ((mode) == BOND_MODE_ALB))
 
-#define TX_QUEUE_OVERRIDE(mode)				\
-			(((mode) == BOND_MODE_ACTIVEBACKUP) ||	\
-			 ((mode) == BOND_MODE_ROUNDROBIN))
+#define BOND_TX_QUEUE_OVERRIDE(bond)			\
+		(((bond->params.mode) == BOND_MODE_ACTIVEBACKUP) ||	\
+		 ((bond->params.mode) == BOND_MODE_ROUNDROBIN))
 
 #define BOND_IS_LB(bond)			\
 		(((bond->params.mode) == BOND_MODE_TLB) ||	\