summaryrefslogtreecommitdiffstats
path: root/drivers/net/net_failover.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2018-07-09 12:20:04 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-07-09 13:57:25 -0700
commit8ec56fc3c5ee6f9700adac190e9ce5b8859a58b6 (patch)
tree717c1c9bc43906f1f9e306ef1e0c298ea23536f7 /drivers/net/net_failover.c
parent4f49dec9075aa0277b8c9c657ec31e6361f88724 (diff)
downloadlinux-8ec56fc3c5ee6f9700adac190e9ce5b8859a58b6.tar.bz2
net: allow fallback function to pass netdev
For most of these calls we can just pass NULL through to the fallback function as the sb_dev. The only cases where we cannot are the cases where we might be dealing with either an upper device or a driver that would have configured things to support an sb_dev itself. The only driver that has any significant change in this patch set should be ixgbe as we can drop the redundant functionality that existed in both the ndo_select_queue function and the fallback function that was passed through to us. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/net_failover.c')
-rw-r--r--drivers/net/net_failover.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c
index 78b549698b7b..d00d42c845b7 100644
--- a/drivers/net/net_failover.c
+++ b/drivers/net/net_failover.c
@@ -131,7 +131,7 @@ static u16 net_failover_select_queue(struct net_device *dev,
txq = ops->ndo_select_queue(primary_dev, skb,
sb_dev, fallback);
else
- txq = fallback(primary_dev, skb);
+ txq = fallback(primary_dev, skb, NULL);
qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;