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>

diff --git a/net/core/dev.c b/net/core/dev.c
index 3d24d9a590861b0634dd651be2702eca2280bc9f..94435cd09072b861fb77934599bfe625084684a7 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3420,8 +3420,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev,
                else
                        queue_index = __netdev_pick_tx(dev, skb);
 
-               if (!accel_priv)
-                       queue_index = netdev_cap_txqueue(dev, queue_index);
+               queue_index = netdev_cap_txqueue(dev, queue_index);
        }
 
        skb_set_queue_mapping(skb, queue_index);