summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAmritha Nambiar <amritha.nambiar@intel.com>2018-05-17 23:50:44 +0200
committerDavid S. Miller <davem@davemloft.net>2018-05-18 18:06:22 +0200
commit6358d49ac23995fdfe157cc8747ab0f274d3954b (patch)
treeaae74219e91e2887c81052c17ae60006f10d70e3 /net
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (diff)
downloadlinux-6358d49ac23995fdfe157cc8747ab0f274d3954b.tar.xz
linux-6358d49ac23995fdfe157cc8747ab0f274d3954b.zip
net: Fix a bug in removing queues from XPS map
While removing queues from the XPS map, the individual CPU ID alone was used to index the CPUs map, this should be changed to also factor in the traffic class mapping for the CPU-to-queue lookup. Fixes: 184c449f91fe ("net: Add support for XPS with QoS via traffic classes") Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com> Acked-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index af0558b00c6c..2af787e8b130 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2124,7 +2124,7 @@ static bool remove_xps_queue_cpu(struct net_device *dev,
int i, j;
for (i = count, j = offset; i--; j++) {
- if (!remove_xps_queue(dev_maps, cpu, j))
+ if (!remove_xps_queue(dev_maps, tci, j))
break;
}