pktgen: set correct max and min in pktgen_setup_inject() (26e29eed) · Commits · 戴 / test

In "pktgen: fix multiple queue warning" we added special logic to handle the case where ntxq is zero. It's not clear to me that ntxq can actually be zero. But if it were then we would set ->queue_map_min and ->queue_map_max to USHRT_MAX when probably we want to set them to zero? Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/pktgen.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2024,13 +2024,13 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
		pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
		pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq,
		pkt_dev->odevname);
		pkt_dev->queue_map_min = ntxq - 1;
		pkt_dev->queue_map_min = (ntxq ?: 1) - 1;
		}
		if (pkt_dev->queue_map_max >= ntxq) {
		pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
		pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq,
		pkt_dev->odevname);
		pkt_dev->queue_map_max = ntxq - 1;
		pkt_dev->queue_map_max = (ntxq ?: 1) - 1;
		}

		/* Default to the interface's mac if not explicitly set. */

Admin message