kernel: Remove some more unused variables in the network drivers.

diff --git a/sys/dev/netif/alc/if_alc.c b/sys/dev/netif/alc/if_alc.c
index 61d64b3..763018f 100644 (file)
--- a/sys/dev/netif/alc/if_alc.c
+++ b/sys/dev/netif/alc/if_alc.c
@@ -1954,15 +1954,19 @@ alc_encap(struct alc_softc *sc, struct mbuf **m_head)
        struct tcphdr *tcp;
        bus_dma_segment_t txsegs[ALC_MAXTXSEGS];
        bus_dmamap_t map;
-       uint32_t cflags, hdrlen, ip_off, poff, vtag;
+       uint32_t cflags, hdrlen, poff, vtag;
+#if 0 /* XXX: TSO */
+       uint32_t ip_off;
+#endif
        int error, idx, nsegs, prod;
 
        M_ASSERTPKTHDR((*m_head));
 
        m = *m_head;
        tcp = NULL;
-       ip_off = poff = 0;
+       poff = 0;
 #if 0 /* XXX: TSO */
+       ip_off = 0;
        ip = NULL;
 
        if ((m->m_pkthdr.csum_flags & (ALC_CSUM_FEATURES | CSUM_TSO)) != 0) {

diff --git a/sys/dev/netif/ath/ath/if_ath.c b/sys/dev/netif/ath/ath/if_ath.c
index 0fb4fde..5a88cf2 100644 (file)
--- a/sys/dev/netif/ath/ath/if_ath.c
+++ b/sys/dev/netif/ath/ath/if_ath.c
@@ -4878,7 +4878,7 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
        struct ifnet *ifp = sc->sc_ifp;
        struct ieee80211com *ic = ifp->if_l2com;
        struct ath_buf *bf, *last;
-       struct ath_desc *ds, *ds0;
+       struct ath_desc *ds;
        struct ath_tx_status *ts;
        struct ieee80211_node *ni;
        struct ath_node *an;
@@ -4897,7 +4897,6 @@ ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq)
                bf = STAILQ_FIRST(&txq->axq_q);
                if (bf == NULL)
                        break;
-               ds0 = &bf->bf_desc[0];
                ds = &bf->bf_desc[bf->bf_nseg - 1];
                ts = &bf->bf_status.ds_txstat;
                qbusy = ath_hal_txqenabled(ah, txq->axq_qnum);

diff --git a/sys/dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c b/sys/dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c
index 8c6f6e4..71ca51b 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c
@@ -181,7 +181,6 @@ eepromExpandPower5112(struct ath_hal *ah,
        EEPROM_POWER_EXPN_5112 *pPowerExpn)
 {
        int ii, jj, kk;
-       int16_t maxPower_t4;
        EXPN_DATA_PER_XPD_5112 *pExpnXPD;
        /* ptr to array of info held per channel */
        const EEPROM_DATA_PER_CHANNEL_5112 *pCalCh;
@@ -218,7 +217,6 @@ eepromExpandPower5112(struct ath_hal *ah,
                        pCalCh->channelValue;
                pPowerExpn->pDataPerChannel[ii].maxPower_t4 =
                        pCalCh->maxPower_t4;
-               maxPower_t4 = pPowerExpn->pDataPerChannel[ii].maxPower_t4;
 
                for (jj = 0; jj < NUM_XPD_PER_CHANNEL; jj++)
                        pPowerExpn->pDataPerChannel[ii].pDataPerXPD[jj].numPcdacs = 0;

diff --git a/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2413.c b/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2413.c
index edc9af4..3a77a39 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2413.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2413.c
@@ -290,13 +290,12 @@ ar2413FillVpdTable(uint32_t pdGainIdx, int16_t Pmin, int16_t  Pmax,
                   const int16_t *pwrList, const uint16_t *VpdList,
                   uint16_t numIntercepts, uint16_t retVpdList[][64])
 {
-       uint16_t ii, jj, kk;
+       uint16_t ii, kk;
        int16_t currPwr = (int16_t)(2*Pmin);
        /* since Pmin is pwr*2 and pwrList is 4*pwr */
        uint32_t  idxL, idxR;
 
        ii = 0;
-       jj = 0;
 
        if (numIntercepts < 2)
                return AH_FALSE;

diff --git a/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2425.c b/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2425.c
index 48a3fd5..7a7ada3 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2425.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ar5212/ar2425.c
@@ -292,13 +292,12 @@ ar2425FillVpdTable(uint32_t pdGainIdx, int16_t Pmin, int16_t  Pmax,
                   uint16_t numIntercepts,
                   uint16_t retVpdList[][64])
 {
-       uint16_t ii, jj, kk;
+       uint16_t ii, kk;
        int16_t currPwr = (int16_t)(2*Pmin);
        /* since Pmin is pwr*2 and pwrList is 4*pwr */
        uint32_t  idxL, idxR;
 
        ii = 0;
-       jj = 0;
 
        if (numIntercepts < 2)
                return AH_FALSE;

diff --git a/sys/dev/netif/ath/hal/ath_hal/ar5212/ar5413.c b/sys/dev/netif/ath/hal/ath_hal/ar5212/ar5413.c
index 0568f39..d318314 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ar5212/ar5413.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ar5212/ar5413.c
@@ -334,13 +334,12 @@ ar5413FillVpdTable(uint32_t pdGainIdx, int16_t Pmin, int16_t  Pmax,
                   uint16_t numIntercepts,
                   uint16_t retVpdList[][64])
 {
-       uint16_t ii, jj, kk;
+       uint16_t ii, kk;
        int16_t currPwr = (int16_t)(2*Pmin);
        /* since Pmin is pwr*2 and pwrList is 4*pwr */
        uint32_t  idxL, idxR;
 
        ii = 0;
-       jj = 0;
 
        if (numIntercepts < 2)
                return AH_FALSE;

diff --git a/sys/dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c b/sys/dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c
index dd7353a..e668e11 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c
@@ -138,7 +138,7 @@ ar5416ResetStaBeaconTimers(struct ath_hal *ah)
 void
 ar5416SetStaBeaconTimers(struct ath_hal *ah, const HAL_BEACON_STATE *bs)
 {
-       uint32_t nextTbtt, nextdtim,beaconintval, dtimperiod;
+       uint32_t nextTbtt, beaconintval, dtimperiod;
 
        HALASSERT(bs->bs_intval != 0);
        
@@ -214,7 +214,6 @@ ar5416SetStaBeaconTimers(struct ath_hal *ah, const HAL_BEACON_STATE *bs)
                nextTbtt = bs->bs_nextdtim;
        else
                nextTbtt = bs->bs_nexttbtt;
-       nextdtim = bs->bs_nextdtim;
 
        OS_REG_WRITE(ah, AR_NEXT_DTIM,
                TU_TO_USEC(bs->bs_nextdtim - SLEEP_SLOP));

diff --git a/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9280_attach.c b/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9280_attach.c
index 5a62ea5..1f88bfd 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9280_attach.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9280_attach.c
@@ -306,13 +306,12 @@ ar9280ConfigPCIE(struct ath_hal *ah, HAL_BOOL restore)
 static void
 ar9280WriteIni(struct ath_hal *ah, const struct ieee80211_channel *chan)
 {
-       u_int modesIndex, freqIndex;
+       u_int modesIndex;
        int regWrites = 0;
 
        /* Setup the indices for the next set of register array writes */
        /* XXX Ignore 11n dynamic mode on the AR5416 for the moment */
        if (IEEE80211_IS_CHAN_2GHZ(chan)) {
-               freqIndex = 2;
                if (IEEE80211_IS_CHAN_HT40(chan))
                        modesIndex = 3;
                else if (IEEE80211_IS_CHAN_108G(chan))
@@ -320,7 +319,6 @@ ar9280WriteIni(struct ath_hal *ah, const struct ieee80211_channel *chan)
                else
                        modesIndex = 4;
        } else {
-               freqIndex = 1;
                if (IEEE80211_IS_CHAN_HT40(chan) ||
                    IEEE80211_IS_CHAN_TURBO(chan))
                        modesIndex = 2;

diff --git a/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9285_attach.c b/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9285_attach.c
index 36bea83..db7718b 100644 (file)
--- a/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9285_attach.c
+++ b/sys/dev/netif/ath/hal/ath_hal/ar5416/ar9285_attach.c
@@ -291,12 +291,11 @@ ar9285ConfigPCIE(struct ath_hal *ah, HAL_BOOL restore)
 static void
 ar9285WriteIni(struct ath_hal *ah, const struct ieee80211_channel *chan)
 {
-       u_int modesIndex, freqIndex;
+       u_int modesIndex;
        int regWrites = 0;
 
        /* Setup the indices for the next set of register array writes */
        /* XXX Ignore 11n dynamic mode on the AR5416 for the moment */
-       freqIndex = 2;
        if (IEEE80211_IS_CHAN_HT40(chan))
                modesIndex = 3;
        else if (IEEE80211_IS_CHAN_108G(chan))

diff --git a/sys/dev/netif/ath/rate_sample/sample.h b/sys/dev/netif/ath/rate_sample/sample.h
index 6d08b8c..b9b1a89 100644 (file)
--- a/sys/dev/netif/ath/rate_sample/sample.h
+++ b/sys/dev/netif/ath/rate_sample/sample.h
@@ -221,7 +221,6 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
        }
 
        if (rts || cts) {
-               int ctsrate;
                int ctsduration = 0;
 
                /* NB: this is intentionally not a runtime check */
@@ -229,7 +228,6 @@ static unsigned calc_usecs_unicast_packet(struct ath_softc *sc,
                    ("bogus cix %d, max %u, mode %u", cix, rt->rateCount,
                     sc->sc_curmode));
 
-               ctsrate = rt->info[cix].rateCode | rt->info[cix].shortPreamble;
                if (rts)                /* SIFS + CTS */
                        ctsduration += rt->info[cix].spAckDuration;
 

diff --git a/sys/dev/netif/bce/if_bce.c b/sys/dev/netif/bce/if_bce.c
index ce0ab11..b05af93 100644 (file)
--- a/sys/dev/netif/bce/if_bce.c
+++ b/sys/dev/netif/bce/if_bce.c
@@ -4401,7 +4401,6 @@ bce_rx_intr(struct bce_softc *sc, int count, uint16_t hw_cons)
        while (sw_cons != hw_cons) {
                struct mbuf *m = NULL;
                struct l2_fhdr *l2fhdr = NULL;
-               struct rx_bd *rxbd;
                unsigned int len;
                uint32_t status = 0;
 
@@ -4417,9 +4416,6 @@ bce_rx_intr(struct bce_softc *sc, int count, uint16_t hw_cons)
                sw_chain_cons = RX_CHAIN_IDX(sc, sw_cons);
                sw_chain_prod = RX_CHAIN_IDX(sc, sw_prod);
 
-               /* Get the used rx_bd. */
-               rxbd = &sc->rx_bd_chain[RX_PAGE(sw_chain_cons)]
-                                      [RX_IDX(sw_chain_cons)];
                sc->free_rx_bd++;
 
                /* The mbuf is stored with the last rx_bd entry of a packet. */

diff --git a/sys/dev/netif/bnx/if_bnx.c b/sys/dev/netif/bnx/if_bnx.c
index 19d3ba9..bedbe86 100644 (file)
--- a/sys/dev/netif/bnx/if_bnx.c
+++ b/sys/dev/netif/bnx/if_bnx.c
@@ -1754,7 +1754,7 @@ bnx_attach(device_t dev)
        uint32_t hwcfg = 0, misccfg;
        int error = 0, rid, capmask;
        uint8_t ether_addr[ETHER_ADDR_LEN];
-       uint16_t product, vendor;
+       uint16_t product;
        driver_intr_t *intr_func;
        uintptr_t mii_priv = 0;
        u_int intr_flags;
@@ -1770,7 +1770,6 @@ bnx_attach(device_t dev)
        lwkt_serialize_init(&sc->bnx_jslot_serializer);
 
        product = pci_get_device(dev);
-       vendor = pci_get_vendor(dev);
 
 #ifndef BURN_BRIDGES
        if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {

diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index b38fc5c..e6ebb7d 100644 (file)
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -306,7 +306,10 @@ cs_cs89x0_probe(device_t dev)
        unsigned rev_type = 0;
        char chip_revision;
        int eeprom_buff[CHKSUM_LEN];
-       int chip_type, pp_isaint, pp_isadma;
+       int chip_type, pp_isaint;
+#if 0 /* Temporary disabled */
+       int pp_isadma;
+#endif
 
        error = cs_alloc_port(dev, 0, CS_89x0_IO_PORTS);
        if (error)
@@ -339,11 +342,15 @@ cs_cs89x0_probe(device_t dev)
 
        if(chip_type==CS8900) {
                pp_isaint = PP_CS8900_ISAINT;
+#if 0 /* Temporary disabled */
                pp_isadma = PP_CS8900_ISADMA;
+#endif
                sc->send_cmd = TX_CS8900_AFTER_ALL;
        } else {
                pp_isaint = PP_CS8920_ISAINT;
+#if 0 /* Temporary disabled */
                pp_isadma = PP_CS8920_ISADMA;
+#endif
                sc->send_cmd = TX_CS8920_AFTER_ALL;
        }
 
@@ -466,16 +473,14 @@ cs_cs89x0_probe(device_t dev)
                 return (ENXIO);
         }
         
-        /*
-         * Temporary disabled
-         *
+#if 0 /* Temporary disabled */
         if (drq>0)
                cs_writereg(iobase, pp_isadma, drq);
        else {
                device_printf(dev, "incorrect drq\n");
                return 0;
        }
-        */
+#endif
 
        if (bootverbose)
                 device_printf(dev, "CS89%c0%s rev %c media%s%s%s\n",

diff --git a/sys/dev/netif/en_pci/if_en_pci.c b/sys/dev/netif/en_pci/if_en_pci.c
index a7693ea..c63dbc3 100644 (file)
--- a/sys/dev/netif/en_pci/if_en_pci.c
+++ b/sys/dev/netif/en_pci/if_en_pci.c
@@ -335,7 +335,7 @@ eni_get_macaddr(struct en_pci_softc *scp)
 {
   struct en_softc * sc = (struct en_softc *)scp;
   pcici_t id = scp->en_confid;
-  int i, j, address, status;
+  int i, j, address;
   u_int32_t data, t_data;
   u_int8_t tmp;
   
@@ -371,7 +371,6 @@ eni_get_macaddr(struct en_pci_softc *scp)
     data |= EN_PROM_CLK ;
     pci_conf_write(id, EN_TONGA, data);
     data = pci_conf_read(id, EN_TONGA);
-    status = data & EN_PROM_DATA;
     data &= ~EN_PROM_CLK ;
     pci_conf_write(id, EN_TONGA, data);
     data |= EN_PROM_DATA ;
@@ -398,7 +397,6 @@ eni_get_macaddr(struct en_pci_softc *scp)
     data |= EN_PROM_CLK ;
     pci_conf_write(id, EN_TONGA, data);
     data = pci_conf_read(id, EN_TONGA);
-    status = data & EN_PROM_DATA;
     data &= ~EN_PROM_CLK ;
     pci_conf_write(id, EN_TONGA, data);
     data |= EN_PROM_DATA ;

diff --git a/sys/dev/netif/igb/if_igb.c b/sys/dev/netif/igb/if_igb.c
index a8bd5bf..5cdc88f 100644 (file)
--- a/sys/dev/netif/igb/if_igb.c
+++ b/sys/dev/netif/igb/if_igb.c
@@ -3174,7 +3174,7 @@ igb_encap(struct igb_tx_ring *txr, struct mbuf **m_headp,
        union e1000_adv_tx_desc *txd = NULL;
        struct mbuf *m_head = *m_headp;
        uint32_t olinfo_status = 0, cmd_type_len = 0, cmd_rs = 0;
-       int maxsegs, nsegs, i, j, error, last = 0;
+       int maxsegs, nsegs, i, j, error;
        uint32_t hdrlen = 0;
 
        if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
@@ -3275,7 +3275,6 @@ igb_encap(struct igb_tx_ring *txr, struct mbuf **m_headp,
                txd->read.buffer_addr = htole64(seg_addr);
                txd->read.cmd_type_len = htole32(cmd_type_len | seg_len);
                txd->read.olinfo_status = htole32(olinfo_status);
-               last = i;
                if (++i == txr->num_tx_desc)
                        i = 0;
                tx_buf->m_head = NULL;

diff --git a/sys/dev/netif/iwi/if_iwi.c b/sys/dev/netif/iwi/if_iwi.c
index 1f48e0b..95e797c 100644 (file)
--- a/sys/dev/netif/iwi/if_iwi.c
+++ b/sys/dev/netif/iwi/if_iwi.c
@@ -1321,7 +1321,7 @@ iwi_checkforqos(struct ieee80211vap *vap,
 #define        SUBTYPE(wh)     ((wh)->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK)
        const uint8_t *frm, *efrm, *wme;
        struct ieee80211_node *ni;
-       uint16_t capinfo, status, associd;
+       uint16_t capinfo, associd;
 
        /* NB: +8 for capinfo, status, associd, and first ie */
        if (!(sizeof(*wh)+8 < len && len < IEEE80211_MAX_LEN) ||
@@ -1341,7 +1341,6 @@ iwi_checkforqos(struct ieee80211vap *vap,
 
        capinfo = le16toh(*(const uint16_t *)frm);
        frm += 2;
-       status = le16toh(*(const uint16_t *)frm);
        frm += 2;
        associd = le16toh(*(const uint16_t *)frm);
        frm += 2;

diff --git a/sys/dev/netif/iwn/if_iwn.c b/sys/dev/netif/iwn/if_iwn.c
index 91b0c67..37d5c52 100644 (file)
--- a/sys/dev/netif/iwn/if_iwn.c
+++ b/sys/dev/netif/iwn/if_iwn.c
@@ -3361,10 +3361,6 @@ iwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 static void
 iwn_start(struct ifnet *ifp)
 {
-       struct iwn_softc *sc;
-
-       sc = ifp->if_softc;
-
        wlan_serialize_enter();
        iwn_start_locked(ifp);
        wlan_serialize_exit();

diff --git a/sys/dev/netif/ixgbe/ixgbe.c b/sys/dev/netif/ixgbe/ixgbe.c
index eec64fc..f6a1022 100644 (file)
--- a/sys/dev/netif/ixgbe/ixgbe.c
+++ b/sys/dev/netif/ixgbe/ixgbe.c
@@ -3783,8 +3783,10 @@ static int
 ixgbe_setup_receive_ring(struct rx_ring *rxr)
 {
        struct  adapter         *adapter;
+#if 0 /* NET_LRO */
        struct ifnet            *ifp;
        device_t                dev;
+#endif
        struct ixgbe_rx_buf     *rxbuf;
        bus_dma_segment_t       pseg[1], hseg[1];
 #if 0  /* NET_LRO */
@@ -3797,8 +3799,10 @@ ixgbe_setup_receive_ring(struct rx_ring *rxr)
 #endif /* DEV_NETMAP */
 
        adapter = rxr->adapter;
+#if 0 /* NET_LRO */
        ifp = adapter->ifp;
        dev = adapter->dev;
+#endif
 
        /* Clear the ring contents */
        IXGBE_RX_LOCK(rxr);

diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c
index 229d978..7c3c0da 100644 (file)
--- a/sys/dev/netif/mn/if_mn.c
+++ b/sys/dev/netif/mn/if_mn.c
@@ -1008,9 +1008,11 @@ mn_reset(struct softc *sc)
 static void
 f54_intr(struct softc *sc)
 {
-       unsigned g, u, s;
-
+       unsigned u, s;
+#if 0
+       unsigned g;
        g = sc->f54r->gis;
+#endif
        u = sc->f54r->isr0 << 24;
        u |= sc->f54r->isr1 << 16;
        u |= sc->f54r->isr2 <<  8;

diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c
index 642ff08..97d0d1f 100644 (file)
--- a/sys/dev/netif/sk/if_sk.c
+++ b/sys/dev/netif/sk/if_sk.c
@@ -1818,7 +1818,7 @@ sk_rxeof(struct sk_if_softc *sc_if)
        struct ifnet *ifp = &sc_if->arpcom.ac_if;
        struct sk_chain_data *cd = &sc_if->sk_cdata;
        struct sk_ring_data *rd = &sc_if->sk_rdata;
-       int i, reap, max_frmlen;
+       int i, max_frmlen;
 
        DPRINTFN(2, ("sk_rxeof\n"));
 
@@ -1829,7 +1829,6 @@ sk_rxeof(struct sk_if_softc *sc_if)
        else
                max_frmlen = ETHER_MAX_LEN;
 
-       reap = 0;
        for (;;) {
                struct sk_rx_desc *cur_desc;
                uint32_t rxstat, sk_ctl;
@@ -1865,7 +1864,6 @@ sk_rxeof(struct sk_if_softc *sc_if)
                 * in the following processing any more.
                 */
                SK_INC(i, SK_RX_RING_CNT);
-               reap = 1;
 
                if ((sk_ctl & (SK_RXCTL_STATUS_VALID | SK_RXCTL_FIRSTFRAG |
                    SK_RXCTL_LASTFRAG)) != (SK_RXCTL_STATUS_VALID |
@@ -2002,7 +2000,6 @@ sk_txeof(struct sk_if_softc *sc_if)
        struct sk_chain_data *cd = &sc_if->sk_cdata;
        struct ifnet *ifp = &sc_if->arpcom.ac_if;
        uint32_t idx;
-       int reap = 0;
 
        DPRINTFN(2, ("sk_txeof\n"));
 
@@ -2031,7 +2028,6 @@ sk_txeof(struct sk_if_softc *sc_if)
                        cd->sk_tx_mbuf[idx] = NULL;
                }
                sc_if->sk_cdata.sk_tx_cnt--;
-               reap = 1;
                SK_INC(idx, SK_TX_RING_CNT);
        }