diff options
| author |  David S. Miller <davem@davemloft.net>
| 2018-01-14 12:25:04 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2018-01-14 12:25:04 -0500 |
| commit | 564737f981fb4b4b3266901508bb9b90d9d43de8 (patch) | |
| tree | 9dfbd6f5ed32f569db17ac1cb58d3a07f32db0d1 /net | |
| parent | Merge branch 'mlxsw-Offload-PRIO-qdisc' (diff) | |
| parent | ixgbevf: Fix kernel-doc format warnings (diff) | |
| download | linux-564737f981fb4b4b3266901508bb9b90d9d43de8.tar.gz linux-564737f981fb4b4b3266901508bb9b90d9d43de8.tar.bz2 linux-564737f981fb4b4b3266901508bb9b90d9d43de8.zip | |
Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
Jeff Kirsher says:
====================
10GbE Intel Wired LAN Driver Updates 2018-01-12
This series contains updates to ixgbe, fm10k and net core.
Alex updates the driver to remove a duplicate MAC address check and
verifies that we have not run out of resources to configure a MAC rule
in our filter table. Also do not assume that dev->num_tc was populated
and configured with the driver, since it can be configured via mqprio
without any hardware coordination. Fixed the recording of stats for
MACVLAN in ixgbe and fm10k instead of recording the receive queue on
MACVLAN offloaded frames. When handling a MACVLAN offload, we should
be stopping/starting traffic on our own queues instead of the upper
devices transmit queues. Fixed possible race conditions with the
MACVLAN cleanup with the interface cleanup on shutdown. With the
recent fixes to ixgbe, we can cap the number of queues regardless of
accel_priv being in use or not, since the actual number of queues are
being reported via real_num_tx_queues.
Tony fixes up the kernel documentation for ixgbe and ixgbevf to resolve
warnings when W=1 is used.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 3 |
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, 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); |