aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-01-05 22:13:47 -0500
committerDavid S. Miller <davem@davemloft.net>2012-01-07 15:26:08 -0500
commit26e29eeda048aa6699984c4b9d6997dd1a1315db (patch)
treeeeef1467c079ce2f3470163d5151b35b7e733fb5 /net
parent96dab45fc3eb732de7b7fe03d2250d3815af8929 (diff)
pktgen: set correct max and min in pktgen_setup_inject()
In 882716604ec "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>
Diffstat (limited to 'net')
-rw-r--r--net/core/pktgen.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 449fe0f068f..65f80c7b165 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2024,13 +2024,13 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
2024 pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", 2024 pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
2025 pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq, 2025 pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq,
2026 pkt_dev->odevname); 2026 pkt_dev->odevname);
2027 pkt_dev->queue_map_min = ntxq - 1; 2027 pkt_dev->queue_map_min = (ntxq ?: 1) - 1;
2028 } 2028 }
2029 if (pkt_dev->queue_map_max >= ntxq) { 2029 if (pkt_dev->queue_map_max >= ntxq) {
2030 pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", 2030 pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
2031 pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq, 2031 pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq,
2032 pkt_dev->odevname); 2032 pkt_dev->odevname);
2033 pkt_dev->queue_map_max = ntxq - 1; 2033 pkt_dev->queue_map_max = (ntxq ?: 1) - 1;
2034 } 2034 }
2035 2035
2036 /* Default to the interface's mac if not explicitly set. */ 2036 /* Default to the interface's mac if not explicitly set. */