1 --- a/drivers/net/wireless/ath/ath9k/hw.h
2 +++ b/drivers/net/wireless/ath/ath9k/hw.h
3 @@ -404,6 +404,7 @@ struct ath9k_hw_cal_data {
7 + bool paprd_packet_sent;
10 bool nfcal_interference;
11 --- a/drivers/net/wireless/ath/ath9k/hw.c
12 +++ b/drivers/net/wireless/ath/ath9k/hw.c
13 @@ -1780,6 +1780,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
14 /* Operating channel changed, reset channel calibration data */
15 memset(caldata, 0, sizeof(*caldata));
16 ath9k_init_nfcal_hist_buffer(ah, chan);
17 + } else if (caldata) {
18 + caldata->paprd_packet_sent = false;
20 ah->noise = ath9k_hw_getchan_noise(ah, chan);
22 --- a/drivers/net/wireless/ath/ath9k/xmit.c
23 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
24 @@ -2028,6 +2028,9 @@ static void ath_tx_complete(struct ath_s
26 ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
28 + if (sc->sc_ah->caldata)
29 + sc->sc_ah->caldata->paprd_packet_sent = true;
31 if (!(tx_flags & ATH_TX_ERROR))
33 tx_info->flags |= IEEE80211_TX_STAT_ACK;
34 --- a/drivers/net/wireless/ath/ath9k/link.c
35 +++ b/drivers/net/wireless/ath/ath9k/link.c
36 @@ -256,7 +256,7 @@ void ath_paprd_calibrate(struct work_str
41 + if (!caldata || !caldata->paprd_packet_sent || caldata->paprd_done)
45 @@ -283,13 +283,6 @@ void ath_paprd_calibrate(struct work_str
50 - ath_dbg(common, CALIBRATE,
51 - "Sending PAPRD frame for thermal measurement on chain %d\n",
53 - if (!ath_paprd_send_frame(sc, skb, chain))
56 ar9003_paprd_setup_gain_table(ah, chain);
58 ath_dbg(common, CALIBRATE,