diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2008-08-25 22:41:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-29 16:24:10 -0400 |
commit | 1fe1132bad8e98fa34cfb4a3901340d1214b95d7 (patch) | |
tree | 76d67c34d4b6aaa93efb511b0576e254d43e33c4 /drivers/net/wireless/ath9k | |
parent | 14cc709f338f44f1ff69fa0b0e35e9de3ee62eb5 (diff) |
ath9k: Remove sc_lastrx as we don't use it anywhere
Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k')
-rw-r--r-- | drivers/net/wireless/ath9k/core.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath9k/xmit.c | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h index b6b6868195cd..1faa1effa02c 100644 --- a/drivers/net/wireless/ath9k/core.h +++ b/drivers/net/wireless/ath9k/core.h | |||
@@ -970,7 +970,6 @@ struct ath_softc { | |||
970 | struct ath_descdma sc_rxdma; | 970 | struct ath_descdma sc_rxdma; |
971 | int sc_rxbufsize; /* rx size based on mtu */ | 971 | int sc_rxbufsize; /* rx size based on mtu */ |
972 | u32 *sc_rxlink; /* link ptr in last RX desc */ | 972 | u32 *sc_rxlink; /* link ptr in last RX desc */ |
973 | u64 sc_lastrx; /* tsf of last rx'd frame */ | ||
974 | 973 | ||
975 | /* TX */ | 974 | /* TX */ |
976 | struct list_head sc_txbuf; | 975 | struct list_head sc_txbuf; |
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c index 87aebf175737..3fc6641e8bf7 100644 --- a/drivers/net/wireless/ath9k/xmit.c +++ b/drivers/net/wireless/ath9k/xmit.c | |||
@@ -2309,8 +2309,7 @@ int ath_tx_start(struct ath_softc *sc, struct sk_buff *skb) | |||
2309 | 2309 | ||
2310 | void ath_tx_tasklet(struct ath_softc *sc) | 2310 | void ath_tx_tasklet(struct ath_softc *sc) |
2311 | { | 2311 | { |
2312 | u64 tsf = ath9k_hw_gettsf64(sc->sc_ah); | 2312 | int i; |
2313 | int i, nacked = 0; | ||
2314 | u32 qcumask = ((1 << ATH9K_NUM_TX_QUEUES) - 1); | 2313 | u32 qcumask = ((1 << ATH9K_NUM_TX_QUEUES) - 1); |
2315 | 2314 | ||
2316 | ath9k_hw_gettxintrtxqs(sc->sc_ah, &qcumask); | 2315 | ath9k_hw_gettxintrtxqs(sc->sc_ah, &qcumask); |
@@ -2320,10 +2319,8 @@ void ath_tx_tasklet(struct ath_softc *sc) | |||
2320 | */ | 2319 | */ |
2321 | for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { | 2320 | for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) { |
2322 | if (ATH_TXQ_SETUP(sc, i) && (qcumask & (1 << i))) | 2321 | if (ATH_TXQ_SETUP(sc, i) && (qcumask & (1 << i))) |
2323 | nacked += ath_tx_processq(sc, &sc->sc_txq[i]); | 2322 | ath_tx_processq(sc, &sc->sc_txq[i]); |
2324 | } | 2323 | } |
2325 | if (nacked) | ||
2326 | sc->sc_lastrx = tsf; | ||
2327 | } | 2324 | } |
2328 | 2325 | ||
2329 | void ath_tx_draintxq(struct ath_softc *sc, | 2326 | void ath_tx_draintxq(struct ath_softc *sc, |