svn commit: r321629 - in head/sys: dev/bnxt net

[Sean Bruno]

Author: sbruno
Date: Thu Jul 27 21:21:43 2017
New Revision: 321629
URL: https://svnweb.freebsd.org/changeset/base/321629

Log:
  Deprecate unused int isc_max_txqsets and int isc_max_rxqsets as they
  were redundant and not being used to set anything up.
  
  Submitted by:	Matt Macy <mmacy at mattmacy.io>
  Reported by:	Jeb Cramer <cramerj at intel.com>
  Sponsored by:	Limelight Networks

Modified:
  head/sys/dev/bnxt/if_bnxt.c
  head/sys/net/iflib.h

Modified: head/sys/dev/bnxt/if_bnxt.c
==============================================================================
--- head/sys/dev/bnxt/if_bnxt.c	Thu Jul 27 20:55:31 2017	(r321628)
+++ head/sys/dev/bnxt/if_bnxt.c	Thu Jul 27 21:21:43 2017	(r321629)
@@ -761,12 +761,12 @@ bnxt_attach_pre(if_ctx_t ctx)
 	    scctx->isc_nrxd[1];
 	scctx->isc_rxqsizes[2] = sizeof(struct rx_prod_pkt_bd) *
 	    scctx->isc_nrxd[2];
-	scctx->isc_max_rxqsets = min(pci_msix_count(softc->dev)-1,
+	scctx->isc_nrxqsets_max = min(pci_msix_count(softc->dev)-1,
 	    softc->func.max_cp_rings - 1);
-	scctx->isc_max_rxqsets = min(scctx->isc_max_rxqsets,
+	scctx->isc_nrxqsets_max = min(scctx->isc_nrxqsets_max,
 	    softc->func.max_rx_rings);
-	scctx->isc_max_txqsets = min(softc->func.max_rx_rings,
-	    softc->func.max_cp_rings - scctx->isc_max_rxqsets - 1);
+	scctx->isc_ntxqsets_max = min(softc->func.max_rx_rings,
+	    softc->func.max_cp_rings - scctx->isc_nrxqsets_max - 1);
 	scctx->isc_rss_table_size = HW_HASH_INDEX_SIZE;
 	scctx->isc_rss_table_mask = scctx->isc_rss_table_size - 1;
 

Modified: head/sys/net/iflib.h
==============================================================================
--- head/sys/net/iflib.h	Thu Jul 27 20:55:31 2017	(r321628)
+++ head/sys/net/iflib.h	Thu Jul 27 21:21:43 2017	(r321629)
@@ -200,8 +200,6 @@ typedef struct if_softc_ctx {
 	uint8_t isc_txd_size[8];
 	uint8_t isc_rxd_size[8];
 
-	int isc_max_txqsets;
-	int isc_max_rxqsets;
 	int isc_tx_tso_segments_max;
 	int isc_tx_tso_size_max;
 	int isc_tx_tso_segsize_max;