aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath/ath9k/ath9k.h1
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c6
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 {
562 struct mutex mutex; 562 struct mutex mutex;
563 struct work_struct paprd_work; 563 struct work_struct paprd_work;
564 struct completion paprd_complete; 564 struct completion paprd_complete;
565 int paprd_txok;
566 565
567 u32 intrstatus; 566 u32 intrstatus;
568 u32 sc_flags; /* SC_OP_* */ 567 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,
1948 if (bf->bf_state.bfs_paprd) { 1948 if (bf->bf_state.bfs_paprd) {
1949 if (time_after(jiffies, 1949 if (time_after(jiffies,
1950 bf->bf_state.bfs_paprd_timestamp + 1950 bf->bf_state.bfs_paprd_timestamp +
1951 msecs_to_jiffies(ATH_PAPRD_TIMEOUT))) { 1951 msecs_to_jiffies(ATH_PAPRD_TIMEOUT)))
1952 dev_kfree_skb_any(skb); 1952 dev_kfree_skb_any(skb);
1953 } else { 1953 else
1954 sc->paprd_txok = txok;
1955 complete(&sc->paprd_complete); 1954 complete(&sc->paprd_complete);
1956 }
1957 } else { 1955 } else {
1958 ath_tx_complete(sc, skb, bf->aphy, tx_flags); 1956 ath_tx_complete(sc, skb, bf->aphy, tx_flags);
1959 ath_debug_stat_tx(sc, txq, bf, ts); 1957 ath_debug_stat_tx(sc, txq, bf, ts);