svn commit: r340010 - head/sys/dev/ixl

[Eric Joyner]

Author: erj
Date: Thu Nov  1 17:29:14 2018
New Revision: 340010
URL: https://svnweb.freebsd.org/changeset/base/340010

Log:
  ixl/iavf(4): Update remaining references of "num_queues" to "num_rx_queues"
  
  This should fix a build issue when "options RSS" is set.
  
  Reported by:	bz@
  Sponsored by:	Intel Corporation

Modified:
  head/sys/dev/ixl/iavf_vc.c
  head/sys/dev/ixl/if_iavf.c

Modified: head/sys/dev/ixl/iavf_vc.c
==============================================================================
--- head/sys/dev/ixl/iavf_vc.c	Thu Nov  1 17:26:18 2018	(r340009)
+++ head/sys/dev/ixl/iavf_vc.c	Thu Nov  1 17:29:14 2018	(r340010)
@@ -720,10 +720,6 @@ iavf_update_stats_counters(struct iavf_sc *sc, struct 
 	uint64_t tx_discards;
 
 	tx_discards = es->tx_discards;
-#if 0
-	for (int i = 0; i < vsi->num_queues; i++)
-		tx_discards += sc->vsi.queues[i].txr.br->br_drops;
-#endif
 
 	/* Update ifnet stats */
 	IXL_SET_IPACKETS(vsi, es->rx_unicast +
@@ -826,7 +822,7 @@ iavf_config_rss_lut(struct iavf_sc *sc)
 		/*
 		 * Fetch the RSS bucket id for the given indirection entry.
 		 * Cap it at the number of configured buckets (which is
-		 * num_queues.)
+		 * num_rx_queues.)
 		 */
 		que_id = rss_get_indirection_to_bucket(i);
 		que_id = que_id % sc->vsi.num_rx_queues;

Modified: head/sys/dev/ixl/if_iavf.c
==============================================================================
--- head/sys/dev/ixl/if_iavf.c	Thu Nov  1 17:26:18 2018	(r340009)
+++ head/sys/dev/ixl/if_iavf.c	Thu Nov  1 17:29:14 2018	(r340010)
@@ -1946,10 +1946,10 @@ iavf_config_rss_reg(struct iavf_sc *sc)
 		/*
 		 * Fetch the RSS bucket id for the given indirection entry.
 		 * Cap it at the number of configured buckets (which is
-		 * num_queues.)
+		 * num_rx_queues.)
 		 */
 		que_id = rss_get_indirection_to_bucket(i);
-		que_id = que_id % vsi->num_queues;
+		que_id = que_id % vsi->num_rx_queues;
 #else
 		que_id = j;
 #endif