diff options
| author |   Vasanthakumar Thiagarajan <vasanth@atheros.com> | 2010-06-24 02:42:46 -0700 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2010-06-24 15:42:42 -0400 |
| commit | 78a181725162c33cdc8907c3c224bd8b6b628f0e (patch) | |
| tree | 0a5aa7dd9816a8d1bc70805a8be2c743f0645c98 /drivers/net/wireless/ath | |
| parent | ath9k: Fix bug in paprd (diff) | |
| download | linux-dev-78a181725162c33cdc8907c3c224bd8b6b628f0e.tar.xz linux-dev-78a181725162c33cdc8907c3c224bd8b6b628f0e.zip | |
ath9k: Remove unused paprd_txok
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index ce74af6ef08c..b1e977c3354f 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -562,7 +562,6 @@ struct ath_softc { struct mutex mutex; struct work_struct paprd_work; struct completion paprd_complete; - int paprd_txok; u32 intrstatus; u32 sc_flags; /* SC_OP_* */ diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index edbeffb14a1c..c41185b28c0a 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -1948,12 +1948,10 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf, if (bf->bf_state.bfs_paprd) { if (time_after(jiffies, bf->bf_state.bfs_paprd_timestamp + - msecs_to_jiffies(ATH_PAPRD_TIMEOUT))) { + msecs_to_jiffies(ATH_PAPRD_TIMEOUT))) dev_kfree_skb_any(skb); - } else { - sc->paprd_txok = txok; + else complete(&sc->paprd_complete); - } } else { ath_tx_complete(sc, skb, bf->aphy, tx_flags); ath_debug_stat_tx(sc, txq, bf, ts); |