svn commit: r282583 - projects/em_mq/sys/dev/e1000
Sean Bruno
sbruno at FreeBSD.org
Wed May 13 04:23:23 UTC 2015
Author: sbruno
Date: Thu May 7 15:17:29 2015
New Revision: 282583
URL: https://svnweb.freebsd.org/changeset/base/282583
Log:
Remove duplicate num_queues assignment.
No need to iterate twice over num_queues in sysctl handlers.
Modified:
projects/em_mq/sys/dev/e1000/if_em.c
Modified: projects/em_mq/sys/dev/e1000/if_em.c
==============================================================================
--- projects/em_mq/sys/dev/e1000/if_em.c Thu May 7 15:14:50 2015 (r282582)
+++ projects/em_mq/sys/dev/e1000/if_em.c Thu May 7 15:17:29 2015 (r282583)
@@ -2787,7 +2787,6 @@ em_setup_msix(struct adapter *adapter)
val = 5;
else {
adapter->num_queues = 1;
- adapter->num_queues = 1;
device_printf(adapter->dev,
"Insufficient MSIX vectors for >1 queue, "
"using single queue...\n");
@@ -5456,7 +5455,7 @@ em_add_hw_stats(struct adapter *adapter)
CTLFLAG_RD, &adapter->hw.fc.low_water, 0,
"Flow Control Low Watermark");
- for (int i = 0; i < adapter->num_queues; i++, txr++) {
+ for (int i = 0; i < adapter->num_queues; i++, txr++, rxr++) {
snprintf(namebuf, QUEUE_NAME_LEN, "queue_tx_%d", i);
queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, namebuf,
CTLFLAG_RD, NULL, "TX Queue Name");
@@ -5478,8 +5477,7 @@ em_add_hw_stats(struct adapter *adapter)
SYSCTL_ADD_ULONG(ctx, queue_list, OID_AUTO, "no_desc_avail",
CTLFLAG_RD, &txr->no_desc_avail,
"Queue No Descriptor Available");
- }
- for (int i = 0; i < adapter->num_queues; i++, rxr++) {
+
snprintf(namebuf, QUEUE_NAME_LEN, "queue_rx_%d", i);
queue_node = SYSCTL_ADD_NODE(ctx, child, OID_AUTO, namebuf,
CTLFLAG_RD, NULL, "RX Queue Name");
More information about the svn-src-projects
mailing list