aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2017-11-22 13:57:41 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-01-12 11:20:36 -0500
commitd584527c70399cf0d095396d696029f54a10cfd3 (patch)
treeb996687befcf2fb63b4d110d5effba79fdd83cc8
parent49cfbeb7a95c0436dfc127e2c37d71ed238532f8 (diff)
net: Cap number of queues even with accel_priv
With the recent fix to ixgbe we can cap the number of queues always regardless of if accel_priv is being used or not since the actual number of queues are being reported via real_num_tx_queues. 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>
-rw-r--r--net/core/dev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 3d24d9a59086..94435cd09072 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3420,8 +3420,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,
3420 else 3420 else
3421 queue_index = __netdev_pick_tx(dev, skb); 3421 queue_index = __netdev_pick_tx(dev, skb);
3422 3422
3423 if (!accel_priv) 3423 queue_index = netdev_cap_txqueue(dev, queue_index);
3424 queue_index = netdev_cap_txqueue(dev, queue_index);
3425 } 3424 }
3426 3425
3427 skb_set_queue_mapping(skb, queue_index); 3426 skb_set_queue_mapping(skb, queue_index);