Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
pktgen: fix multiple queue warning
As number of TX queues in unrelated to number of CPU's we remove this test
and just make sure nxtq never gets exceeded.
Signed-off-by: Robert Olsson <robert.olsson@its.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by Robert Olsson and committed by David S. Miller bfdbc0ac c3e38896
+2
-7
net/core/pktgen.c
+2
-7
net/core/pktgen.c
···
1973
1974
/* make sure that we don't pick a non-existing transmit queue */
1975
ntxq = pkt_dev->odev->real_num_tx_queues;
1976
-
if (ntxq > num_online_cpus() && (pkt_dev->flags & F_QUEUE_MAP_CPU)) {
1977
-
printk(KERN_WARNING "pktgen: WARNING: QUEUE_MAP_CPU "
1978
-
"disabled because CPU count (%d) exceeds number "
1979
-
"of tx queues (%d) on %s\n", num_online_cpus(), ntxq,
1980
-
pkt_dev->odev->name);
1981
-
pkt_dev->flags &= ~F_QUEUE_MAP_CPU;
1982
-
}
1983
if (ntxq <= pkt_dev->queue_map_min) {
1984
printk(KERN_WARNING "pktgen: WARNING: Requested "
1985
"queue_map_min (zero-based) (%d) exceeds valid range "
···
2196
}
2197
pkt_dev->cur_queue_map = t;
2198
}
2199
}
2200
2201
/* Increment/randomize headers according to flags and current values
···
1973
1974
/* make sure that we don't pick a non-existing transmit queue */
1975
ntxq = pkt_dev->odev->real_num_tx_queues;
1976
+
1977
if (ntxq <= pkt_dev->queue_map_min) {
1978
printk(KERN_WARNING "pktgen: WARNING: Requested "
1979
"queue_map_min (zero-based) (%d) exceeds valid range "
···
2202
}
2203
pkt_dev->cur_queue_map = t;
2204
}
2205
+
pkt_dev->cur_queue_map = pkt_dev->cur_queue_map % pkt_dev->odev->real_num_tx_queues;
2206
}
2207
2208
/* Increment/randomize headers according to flags and current values