3 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index bd988ea88bd1..826b665de9c2 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -221,7 +221,6 @@ struct ath_buf_state {
         int bfs_retries;
         u8 bf_type;
         u8 bfs_paprd;
-        unsigned long bfs_paprd_timestamp;
         u32 bfs_keyix;
         enum ath9k_internal_frame_type bfs_ftype;
 };
@@ -598,6 +597,7 @@ struct ath_softc {
         struct work_struct paprd_work;
         struct work_struct hw_check_work;
         struct completion paprd_complete;
+        bool paprd_pending;
 
         u32 intrstatus;
         u32 sc_flags; /* SC_OP_* */
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index df7c62d9bec4..cfec2ad664d8 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -375,6 +375,7 @@ void ath_paprd_calibrate(struct work_struct *work)
                 }
 
                 init_completion(&sc->paprd_complete);
+                sc->paprd_pending = true;
                 ar9003_paprd_setup_gain_table(ah, chain);
                 txctl.paprd = BIT(chain);
                 if (ath_tx_start(hw, skb, &txctl) != 0)
@@ -382,6 +383,7 @@ void ath_paprd_calibrate(struct work_struct *work)
 
                 time_left = wait_for_completion_timeout(&sc->paprd_complete,
                                 msecs_to_jiffies(ATH_PAPRD_TIMEOUT));
+                sc->paprd_pending = false;
                 if (!time_left) {
                         ath_print(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
                                   "Timeout waiting for paprd training on "
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 6e0467cf0812..9f3d23a4e580 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1698,9 +1698,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
                 if (bf->bf_state.bfs_paprd)
                         ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);
 
-                if (txctl->paprd)
-                        bf->bf_state.bfs_paprd_timestamp = jiffies;
-
                 ath_tx_send_normal(sc, txctl->txq, NULL, &bf_head);
         }
 
@@ -1874,9 +1871,7 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
         bf->bf_buf_addr = 0;
 
         if (bf->bf_state.bfs_paprd) {
-                if (time_after(jiffies,
-                               bf->bf_state.bfs_paprd_timestamp +
-                               msecs_to_jiffies(ATH_PAPRD_TIMEOUT)))
+                if (!sc->paprd_pending)
                         dev_kfree_skb_any(skb);
                 else
                         complete(&sc->paprd_complete);