Thread: [Madwifi-cvs] revision 4138 committed
Status: Beta
Brought to you by:
otaku
From: Pavel R. <svn...@ma...> - 2011-05-03 22:00:56
|
Project : madwifi Revision : 4138 Author : proski (Pavel Roskin) Date : 2011-05-04 00:00:38 +0200 (Wed, 04 May 2011) Log Message : Fix all instances of unused variables reported by gcc 4.6.0. Change IEEE80211_NODE_SAVEQ_DEQUEUE to a compound statement returning a value, which may or may not be ignored by the caller. Affected Files: * madwifi/branches/madwifi-dfs/ath/if_ath.c updated * madwifi/branches/madwifi-dfs/ath_hal/ah_eeprom_v3.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_beacon.c updated * madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar9280_attach.c updated * madwifi/branches/madwifi-dfs/ath_rate/sample/sample.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_beacon.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h updated * madwifi/branches/madwifi-dfs/net80211/ieee80211_power.c updated Modified: madwifi/branches/madwifi-dfs/ath/if_ath.c =================================================================== --- madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath/if_ath.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -3318,7 +3318,6 @@ int (*ath_ff_flushdonetest)(struct ath_txq *txq, struct ath_buf *bf)) { struct ath_buf *bf_ff = NULL; - unsigned int pktlen; int framecnt; for (;;) { @@ -3346,7 +3345,6 @@ sc->sc_stats.ast_tx_encap++; goto bad; } - pktlen = bf_ff->bf_skb->len; /* NB: don't reference skb below */ if (ath_tx_start(sc->sc_dev, ATH_BUF_NI(bf_ff), bf_ff, bf_ff->bf_skb, 0) == 0) continue; @@ -3524,7 +3522,6 @@ int requeue = 0; #ifdef ATH_SUPERG_FF struct ether_header *eh; - unsigned int pktlen; struct ieee80211com *ic = &sc->sc_ic; struct ath_txq *txq = NULL; /* NB: NEVER free __skb, leave it alone and use original_skb instead! @@ -3704,7 +3701,6 @@ "failure\n"); sc->sc_stats.ast_tx_encap++; } else { - pktlen = bf_ff->bf_skb->len; /* NB: don't reference skb below */ if (!ath_tx_start(dev, ni, bf_ff, bf_ff->bf_skb, 0)) success = 1; @@ -4860,7 +4856,6 @@ struct ieee80211vap *vap = NULL; struct ath_vap *avp; struct ath_buf *bf; - struct sk_buff *skb; struct ath_desc *ds; struct ath_tx_status *ts; struct ath_hal *ah = sc->sc_ah; @@ -4879,7 +4874,6 @@ return 0; avp = ATH_VAP(vap); bf = avp->av_bcbuf; - skb = bf->bf_skb; ds = bf->bf_desc; ts = &bf->bf_dsstatus.ds_txstat; @@ -6681,7 +6675,6 @@ struct ath_softc *sc = netdev_priv(vap->iv_ic->ic_dev); struct ieee80211_node * ni = ni_or_null; u_int64_t hw_tsf, beacon_tsf; - u_int32_t hw_tu, beacon_tu, intval; int do_merge = 0; if (ni_or_null == NULL) @@ -6739,10 +6732,8 @@ * ath_newstate as the state machine will go from * RUN -> RUN when this happens. */ hw_tsf = ath_hal_gettsf64(sc->sc_ah); - hw_tu = IEEE80211_TSF_TO_TU(hw_tsf); beacon_tsf = le64_to_cpu(ni->ni_tstamp.tsf); - beacon_tu = IEEE80211_TSF_TO_TU(beacon_tsf); DPRINTF(sc, ATH_DEBUG_BEACON, "Beacon transmitted at %10llx, " @@ -6774,7 +6765,6 @@ } #endif - intval = ni->ni_intval & HAL_BEACON_PERIOD; if (do_merge) ieee80211_ibss_merge(ni); } @@ -6809,7 +6799,6 @@ struct ath_softc *sc = netdev_priv(dev); struct ieee80211com *ic = &sc->sc_ic; struct ath_hal *ah = sc ? sc->sc_ah : NULL; - struct ath_desc *ds; struct ath_rx_status *rs; struct ieee80211_node *ni; struct sk_buff *skb = NULL; @@ -6850,7 +6839,6 @@ break; bf_processed++; - ds = bf->bf_desc; #ifdef AR_DEBUG if (sc->sc_debug & ATH_DEBUG_RECV_DESC) @@ -12528,12 +12516,10 @@ static void ath_return_txbuf_locked(struct ath_softc *sc, struct ath_buf **bf) { - struct ath_buf *bfaddr; ATH_TXBUF_LOCK_ASSERT(sc); if ((bf == NULL) || ((*bf) == NULL)) return; - bfaddr = *bf; cleanup_ath_buf(sc, (*bf), BUS_DMA_TODEVICE); STAILQ_INSERT_TAIL(&sc->sc_txbuf, (*bf), bf_list); *bf = NULL; Modified: madwifi/branches/madwifi-dfs/ath_hal/ah_eeprom_v3.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ah_eeprom_v3.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ah_eeprom_v3.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -181,7 +181,6 @@ 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 @@ 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; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2316.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -307,13 +307,12 @@ const int16_t *pwrList, const int16_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; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2317.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -283,13 +283,12 @@ const int16_t *pwrList, const int16_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; @@ -612,14 +611,12 @@ { uint32_t ii; uint16_t Pmax=0,numVpd; - uint16_t vpdmax; for (ii=0; ii< MAX_NUM_PDGAINS_PER_CHANNEL; ii++) { /* work forwards cuase lowest pdGain for highest power */ numVpd = data->pDataPerPDGain[ii].numVpd; if (numVpd > 0) { Pmax = data->pDataPerPDGain[ii].pwr_t4[numVpd-1]; - vpdmax = data->pDataPerPDGain[ii].Vpd[numVpd-1]; return(Pmax); } } Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2413.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -301,13 +301,12 @@ 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; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar2425.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -303,13 +303,12 @@ 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; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5212/ar5413.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -337,13 +337,12 @@ 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; Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_beacon.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_beacon.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar5416_beacon.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -138,7 +138,7 @@ 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 @@ 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)); Modified: madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar9280_attach.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar9280_attach.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_hal/ar5416/ar9280_attach.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -308,13 +308,12 @@ static void ar9280WriteIni(struct ath_hal *ah, const HAL_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 (IS_CHAN_2GHZ(chan)) { - freqIndex = 2; if (IS_CHAN_HT40(chan)) modesIndex = 3; else if (IS_CHAN_108G(chan)) @@ -322,7 +321,6 @@ else modesIndex = 4; } else { - freqIndex = 1; if (IS_CHAN_HT40(chan) || IS_CHAN_TURBO(chan)) modesIndex = 2; Modified: madwifi/branches/madwifi-dfs/ath_rate/sample/sample.c =================================================================== --- madwifi/branches/madwifi-dfs/ath_rate/sample/sample.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/ath_rate/sample/sample.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -225,7 +225,6 @@ rts = 1; if (rts || cts) { - int ctsrate; int ctsduration = 0; if (!rt->info[cix].rateKbps) { @@ -237,7 +236,6 @@ } - ctsrate = rt->info[cix].rateCode | rt->info[cix].shortPreamble; if (rts) /* SIFS + CTS */ ctsduration += rt->info[cix].spAckDuration; Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_beacon.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_beacon.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_beacon.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -197,7 +197,6 @@ struct sk_buff *skb; int pktlen; u_int8_t *frm; - struct ieee80211_rateset *rs; /* * beacon frame format @@ -220,7 +219,6 @@ * XXX Vendor-specific OIDs (e.g. Atheros) * NB: we allocate the max space required for the TIM bitmap. */ - rs = &ni->ni_rates; pktlen = 8 /* time stamp */ + sizeof(u_int16_t) /* beacon interval */ + sizeof(u_int16_t) /* capability information */ Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_input.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -4130,7 +4130,7 @@ /* Okay, take the first queued packet and put it out... */ IEEE80211_NODE_SAVEQ_LOCK_IRQ(ni); - IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen); + qlen = IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb); IEEE80211_NODE_SAVEQ_UNLOCK_IRQ(ni); if (skb == NULL) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_POWER, wh->i_addr2, Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h 2011-05-03 22:00:38 UTC (rev 4138) @@ -362,10 +362,10 @@ #endif /* caller MUST lock IEEE80211_NODE_SAVEQ */ -#define IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _skb, _qlen) do { \ +#define IEEE80211_NODE_SAVEQ_DEQUEUE(_ni, _skb) ({ \ _skb = __skb_dequeue(&(_ni)->ni_savedq); \ - (_qlen) = skb_queue_len(&(_ni)->ni_savedq); \ -} while (0) + skb_queue_len(&(_ni)->ni_savedq); \ +}) #define _IEEE80211_NODE_SAVEQ_ENQUEUE(_ni, _skb, _qlen, _age) do { \ struct sk_buff *tail = skb_peek_tail(&(_ni)->ni_savedq); \ if (tail != NULL) { \ Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_power.c =================================================================== --- madwifi/branches/madwifi-dfs/net80211/ieee80211_power.c 2011-05-03 21:56:02 UTC (rev 4137) +++ madwifi/branches/madwifi-dfs/net80211/ieee80211_power.c 2011-05-03 22:00:38 UTC (rev 4138) @@ -304,10 +304,9 @@ for (;;) { struct sk_buff *skb; - int qlen; IEEE80211_NODE_SAVEQ_LOCK_IRQ(ni); - IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb, qlen); + IEEE80211_NODE_SAVEQ_DEQUEUE(ni, skb); IEEE80211_NODE_SAVEQ_UNLOCK_IRQ(ni); if (skb == NULL) break; |