svn commit: r333870 - in head/sys/dev: bnxt ixgbe netmap

[Matt Macy]

Author: mmacy
Date: Sat May 19 05:57:26 2018
New Revision: 333870
URL: https://svnweb.freebsd.org/changeset/base/333870

Log:
  netmap and iflib drivers, silence unused var warnings

Modified:
  head/sys/dev/bnxt/bnxt_hwrm.c
  head/sys/dev/bnxt/bnxt_txrx.c
  head/sys/dev/ixgbe/ix_txrx.c
  head/sys/dev/ixgbe/ixgbe_x550.c
  head/sys/dev/netmap/if_ptnet.c

Modified: head/sys/dev/bnxt/bnxt_hwrm.c
==============================================================================
--- head/sys/dev/bnxt/bnxt_hwrm.c	Sat May 19 05:56:21 2018	(r333869)
+++ head/sys/dev/bnxt/bnxt_hwrm.c	Sat May 19 05:57:26 2018	(r333870)
@@ -633,9 +633,7 @@ int
 bnxt_hwrm_vnic_cfg(struct bnxt_softc *softc, struct bnxt_vnic_info *vnic)
 {
 	struct hwrm_vnic_cfg_input req = {0};
-	struct hwrm_vnic_cfg_output *resp;
 
-	resp = (void *)softc->hwrm_cmd_resp.idi_vaddr;
 	bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_VNIC_CFG);
 
 	if (vnic->flags & BNXT_VNIC_FLAG_DEFAULT)
@@ -953,9 +951,7 @@ bnxt_hwrm_rss_cfg(struct bnxt_softc *softc, struct bnx
     uint32_t hash_type)
 {
 	struct hwrm_vnic_rss_cfg_input	req = {0};
-	struct hwrm_vnic_rss_cfg_output	*resp;
 
-	resp = (void *)softc->hwrm_cmd_resp.idi_vaddr;
 	bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_VNIC_RSS_CFG);
 
 	req.hash_type = htole32(hash_type);

Modified: head/sys/dev/bnxt/bnxt_txrx.c
==============================================================================
--- head/sys/dev/bnxt/bnxt_txrx.c	Sat May 19 05:56:21 2018	(r333869)
+++ head/sys/dev/bnxt/bnxt_txrx.c	Sat May 19 05:57:26 2018	(r333870)
@@ -263,7 +263,6 @@ bnxt_isc_rxd_refill(void *sc, if_rxd_update_t iru)
 	uint32_t pidx;
 	uint8_t flid;
 	uint64_t *paddrs;
-	caddr_t *vaddrs;
 	qidx_t	*frag_idxs;
 
 	rxqid = iru->iru_qsidx;
@@ -271,7 +270,6 @@ bnxt_isc_rxd_refill(void *sc, if_rxd_update_t iru)
 	len = iru->iru_buf_size;
 	pidx = iru->iru_pidx;
 	flid = iru->iru_flidx;
-	vaddrs = iru->iru_vaddrs;
 	paddrs = iru->iru_paddrs;
 	frag_idxs = iru->iru_idxs;
 
@@ -533,7 +531,6 @@ bnxt_pkt_get_tpa(struct bnxt_softc *softc, if_rxd_info
 {
 	struct rx_tpa_end_cmpl *agend =
 	    &((struct rx_tpa_end_cmpl *)cpr->ring.vaddr)[cpr->cons];
-	struct rx_tpa_end_cmpl_hi *agendh;
 	struct rx_abuf_cmpl *acp;
 	struct bnxt_full_tpa_start *tpas;
 	uint32_t flags2;
@@ -566,7 +563,6 @@ bnxt_pkt_get_tpa(struct bnxt_softc *softc, if_rxd_info
 	/* Now the second 16-byte BD */
 	NEXT_CP_CONS_V(&cpr->ring, cpr->cons, cpr->v_bit);
 	ri->iri_cidx = RING_NEXT(&cpr->ring, ri->iri_cidx);
-	agendh = &((struct rx_tpa_end_cmpl_hi *)cpr->ring.vaddr)[cpr->cons];
 
 	flags2 = le32toh(tpas->high.flags2);
 	if ((flags2 & RX_TPA_START_CMPL_FLAGS2_META_FORMAT_MASK) ==

Modified: head/sys/dev/ixgbe/ix_txrx.c
==============================================================================
--- head/sys/dev/ixgbe/ix_txrx.c	Sat May 19 05:56:21 2018	(r333869)
+++ head/sys/dev/ixgbe/ix_txrx.c	Sat May 19 05:57:26 2018	(r333870)
@@ -217,6 +217,7 @@ ixgbe_isc_txd_encap(void *arg, if_pkt_info_t pi)
 	}
 
 	olinfo_status |= IXGBE_ADVTXD_CC;
+	pidx_last = 0;
 	for (j = 0; j < nsegs; j++) {
 		bus_size_t seglen;
 

Modified: head/sys/dev/ixgbe/ixgbe_x550.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe_x550.c	Sat May 19 05:56:21 2018	(r333869)
+++ head/sys/dev/ixgbe/ixgbe_x550.c	Sat May 19 05:57:26 2018	(r333870)
@@ -1134,7 +1134,7 @@ s32 ixgbe_write_iosf_sb_reg_x550(struct ixgbe_hw *hw, 
 			    u32 device_type, u32 data)
 {
 	u32 gssr = IXGBE_GSSR_PHY1_SM | IXGBE_GSSR_PHY0_SM;
-	u32 command, error;
+	u32 command, error __unused;
 	s32 ret;
 
 	ret = ixgbe_acquire_swfw_semaphore(hw, gssr);
@@ -1180,7 +1180,7 @@ s32 ixgbe_read_iosf_sb_reg_x550(struct ixgbe_hw *hw, u
 			   u32 device_type, u32 *data)
 {
 	u32 gssr = IXGBE_GSSR_PHY1_SM | IXGBE_GSSR_PHY0_SM;
-	u32 command, error;
+	u32 command, error __unused;
 	s32 ret;
 
 	ret = ixgbe_acquire_swfw_semaphore(hw, gssr);

Modified: head/sys/dev/netmap/if_ptnet.c
==============================================================================
--- head/sys/dev/netmap/if_ptnet.c	Sat May 19 05:56:21 2018	(r333869)
+++ head/sys/dev/netmap/if_ptnet.c	Sat May 19 05:57:26 2018	(r333870)
@@ -757,7 +757,7 @@ ptnet_ioctl(if_t ifp, u_long cmd, caddr_t data)
 	struct ptnet_softc *sc = if_getsoftc(ifp);
 	device_t dev = sc->dev;
 	struct ifreq *ifr = (struct ifreq *)data;
-	int mask, err = 0;
+	int mask __unused, err = 0;
 
 	switch (cmd) {
 	case SIOCSIFFLAGS: