diff options
| author | Veaceslav Falico | 2014-05-15 21:39:52 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-05-16 22:34:31 +0200 |
| commit | d1e2e5cd4f8ed2ac7c43ce44feeb9ebc7d27cb4b (patch) | |
| tree | 18608ed63549df537e39ce0c3933939aacbb5012 /drivers/net/bonding/bond_main.c | |
| parent | bonding: remove BOND_MODE_IS_LB macro (diff) | |
| download | kernel-qcow2-linux-d1e2e5cd4f8ed2ac7c43ce44feeb9ebc7d27cb4b.tar.gz kernel-qcow2-linux-d1e2e5cd4f8ed2ac7c43ce44feeb9ebc7d27cb4b.tar.xz kernel-qcow2-linux-d1e2e5cd4f8ed2ac7c43ce44feeb9ebc7d27cb4b.zip | |
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>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 7 |
1 files changed, 3 insertions, 4 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: |