| Message ID | 20120106131346.GA2491@elgon.mountain |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 6 Jan 2012 05:13:47 -0800 Dan Carpenter <dan.carpenter@oracle.com> wrote: > 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? seems fine to me, esp since -1 seems like a bad value there. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jesse Brandeburg <jesse.brandeburg@intel.com> Date: Fri, 6 Jan 2012 09:29:12 -0800 > On Fri, 6 Jan 2012 05:13:47 -0800 > Dan Carpenter <dan.carpenter@oracle.com> wrote: > >> 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? > > seems fine to me, esp since -1 seems like a bad value there. Looks good to me too, applied, thanks everyone. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 449fe0f..65f80c7 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) 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. */