From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 29 Aug 2012 08:16:31 +0000 (+0000)
Subject: mac80211: reorganize patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eb896ce900cf69fdb2afb876dbda3a26be4f7895;p=openwrt%2Fstaging%2Fdedeckeh.git

mac80211: reorganize patches

SVN-Revision: 33289
---

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 3255b8da0c..34a0ceca42 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1628,7 +1628,18 @@
  			channelSel = CHANSEL_5G(freq);
 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -633,6 +633,8 @@
+@@ -625,6 +625,10 @@
+ #define AR_PHY_AIC_CTRL_4_B0	(AR_SM_BASE + 0x4c0)
+ #define AR_PHY_AIC_STAT_2_B0	(AR_SM_BASE + 0x4cc)
+ 
++#define AR_PHY_65NM_CH0_TXRF3       0x16048
++#define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G		0x0000001e
++#define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G_S	1
++
+ #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
+ #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   (AR_SREV_9462(ah) ? 0x00000001 : 0x00000002)
+ #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT_S (AR_SREV_9462(ah) ? 0 : 1)
+@@ -633,6 +637,8 @@
  #define AR_PHY_65NM_CH0_BIAS2       0x160c4
  #define AR_PHY_65NM_CH0_BIAS4       0x160cc
  #define AR_PHY_65NM_CH0_RXTX4       0x1610c
@@ -1637,7 +1648,7 @@
  
  #define AR_CH0_TOP	(AR_SREV_9300(ah) ? 0x16288 : \
  				((AR_SREV_9462(ah) ? 0x1628c : 0x16280)))
-@@ -876,6 +878,9 @@
+@@ -876,6 +882,9 @@
  #define AR_PHY_65NM_CH0_RXTX4_THERM_ON          0x10000000
  #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S        28
  
@@ -2616,7 +2627,17 @@
  
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -671,10 +671,6 @@ static int __ath9k_hw_init(struct ath_hw
+@@ -463,9 +463,6 @@ static void ath9k_hw_init_config(struct 
+ 		ah->config.spurchans[i][1] = AR_NO_SPUR;
+ 	}
+ 
+-	/* PAPRD needs some more work to be enabled */
+-	ah->config.paprd_disable = 1;
+-
+ 	ah->config.rx_intr_mitigation = true;
+ 	ah->config.pcieSerDesWrite = true;
+ 
+@@ -671,10 +668,6 @@ static int __ath9k_hw_init(struct ath_hw
  	if (!AR_SREV_9300_20_OR_LATER(ah))
  		ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
  
@@ -2627,6 +2648,25 @@
  	ath9k_hw_init_mode_regs(ah);
  
  	if (!ah->is_pciexpress)
+@@ -1781,6 +1774,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ 		/* Operating channel changed, reset channel calibration data */
+ 		memset(caldata, 0, sizeof(*caldata));
+ 		ath9k_init_nfcal_hist_buffer(ah, chan);
++	} else if (caldata) {
++		caldata->paprd_packet_sent = false;
+ 	}
+ 	ah->noise = ath9k_hw_getchan_noise(ah, chan);
+ 
+@@ -2505,7 +2500,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+ 		pCap->tx_desc_len = sizeof(struct ar9003_txc);
+ 		pCap->txs_len = sizeof(struct ar9003_txs);
+ 		if (!ah->config.paprd_disable &&
+-		    ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
++		    ah->eep_ops->get_eeprom(ah, EEP_PAPRD) &&
++		    !AR_SREV_9462(ah))
+ 			pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
+ 	} else {
+ 		pCap->tx_desc_len = sizeof(struct ath_desc);
 @@ -2916,9 +2912,9 @@ void ath9k_hw_reset_tsf(struct ath_hw *a
  }
  EXPORT_SYMBOL(ath9k_hw_reset_tsf);
@@ -2641,7 +2681,15 @@
  		ah->misc_mode &= ~AR_PCU_TX_ADD_TSF;
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -994,7 +994,7 @@ u32 ath9k_hw_gettsf32(struct ath_hw *ah)
+@@ -404,6 +404,7 @@ struct ath9k_hw_cal_data {
+ 	int8_t iCoff;
+ 	int8_t qCoff;
+ 	bool rtt_done;
++	bool paprd_packet_sent;
+ 	bool paprd_done;
+ 	bool nfcal_pending;
+ 	bool nfcal_interference;
+@@ -994,7 +995,7 @@ u32 ath9k_hw_gettsf32(struct ath_hw *ah)
  u64 ath9k_hw_gettsf64(struct ath_hw *ah);
  void ath9k_hw_settsf64(struct ath_hw *ah, u64 tsf64);
  void ath9k_hw_reset_tsf(struct ath_hw *ah);
@@ -2726,6 +2774,46 @@
  			count = 0;
  			return true;
  		}
+@@ -255,8 +254,9 @@ void ath_paprd_calibrate(struct work_str
+ 	int chain_ok = 0;
+ 	int chain;
+ 	int len = 1800;
++	int ret;
+ 
+-	if (!caldata)
++	if (!caldata || !caldata->paprd_packet_sent || caldata->paprd_done)
+ 		return;
+ 
+ 	ath9k_ps_wakeup(sc);
+@@ -283,13 +283,6 @@ void ath_paprd_calibrate(struct work_str
+ 			continue;
+ 
+ 		chain_ok = 0;
+-
+-		ath_dbg(common, CALIBRATE,
+-			"Sending PAPRD frame for thermal measurement on chain %d\n",
+-			chain);
+-		if (!ath_paprd_send_frame(sc, skb, chain))
+-			goto fail_paprd;
+-
+ 		ar9003_paprd_setup_gain_table(ah, chain);
+ 
+ 		ath_dbg(common, CALIBRATE,
+@@ -303,7 +296,13 @@ void ath_paprd_calibrate(struct work_str
+ 			break;
+ 		}
+ 
+-		if (ar9003_paprd_create_curve(ah, caldata, chain)) {
++		ret = ar9003_paprd_create_curve(ah, caldata, chain);
++		if (ret == -EINPROGRESS) {
++			ath_dbg(common, CALIBRATE,
++				"PAPRD curve on chain %d needs to be re-trained\n",
++				chain);
++			break;
++		} else if (ret) {
+ 			ath_dbg(common, CALIBRATE,
+ 				"PAPRD create curve failed on chain %d\n",
+ 				chain);
 @@ -432,26 +431,69 @@ set_timer:
  	}
  }
@@ -2875,7 +2963,19 @@
  		goto out;
  	}
  
-@@ -586,6 +577,15 @@ static int ath_reset(struct ath_softc *s
+@@ -468,8 +459,10 @@ irqreturn_t ath_isr(int irq, void *dev)
+ 	if (!ath9k_hw_intrpend(ah))
+ 		return IRQ_NONE;
+ 
+-	if(test_bit(SC_OP_HW_RESET, &sc->sc_flags))
++	if (test_bit(SC_OP_HW_RESET, &sc->sc_flags)) {
++		ath9k_hw_kill_interrupts(ah);
+ 		return IRQ_HANDLED;
++	}
+ 
+ 	/*
+ 	 * Figure out the reason(s) for the interrupt.  Note
+@@ -586,6 +579,15 @@ static int ath_reset(struct ath_softc *s
  	return r;
  }
  
@@ -2891,7 +2991,7 @@
  void ath_reset_work(struct work_struct *work)
  {
  	struct ath_softc *sc = container_of(work, struct ath_softc, hw_reset_work);
-@@ -852,16 +852,6 @@ bool ath9k_uses_beacons(int type)
+@@ -852,16 +854,6 @@ bool ath9k_uses_beacons(int type)
  	}
  }
  
@@ -2908,7 +3008,7 @@
  static void ath9k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif)
  {
  	struct ath9k_vif_iter_data *iter_data = data;
-@@ -929,18 +919,14 @@ static void ath9k_calculate_summary_stat
+@@ -929,18 +921,14 @@ static void ath9k_calculate_summary_stat
  
  	ath9k_calculate_iter_data(hw, vif, &iter_data);
  
@@ -2929,7 +3029,7 @@
  
  		if (iter_data.nmeshes)
  			ah->opmode = NL80211_IFTYPE_MESH_POINT;
-@@ -952,45 +938,14 @@ static void ath9k_calculate_summary_stat
+@@ -952,45 +940,14 @@ static void ath9k_calculate_summary_stat
  			ah->opmode = NL80211_IFTYPE_STATION;
  	}
  
@@ -2977,7 +3077,7 @@
  }
  
  static int ath9k_add_interface(struct ieee80211_hw *hw,
-@@ -1032,7 +987,10 @@ static int ath9k_add_interface(struct ie
+@@ -1032,7 +989,10 @@ static int ath9k_add_interface(struct ie
  
  	sc->nvifs++;
  
@@ -2989,7 +3089,7 @@
  out:
  	mutex_unlock(&sc->mutex);
  	ath9k_ps_restore(sc);
-@@ -1049,6 +1007,7 @@ static int ath9k_change_interface(struct
+@@ -1049,6 +1009,7 @@ static int ath9k_change_interface(struct
  	int ret = 0;
  
  	ath_dbg(common, CONFIG, "Change Interface\n");
@@ -2997,7 +3097,7 @@
  	mutex_lock(&sc->mutex);
  	ath9k_ps_wakeup(sc);
  
-@@ -1061,15 +1020,16 @@ static int ath9k_change_interface(struct
+@@ -1061,15 +1022,16 @@ static int ath9k_change_interface(struct
  		}
  	}
  
@@ -3018,7 +3118,7 @@
  out:
  	ath9k_ps_restore(sc);
  	mutex_unlock(&sc->mutex);
-@@ -1089,9 +1049,8 @@ static void ath9k_remove_interface(struc
+@@ -1089,9 +1051,8 @@ static void ath9k_remove_interface(struc
  
  	sc->nvifs--;
  
@@ -3029,7 +3129,7 @@
  
  	ath9k_calculate_summary_state(hw, NULL);
  
-@@ -1388,21 +1347,18 @@ static int ath9k_conf_tx(struct ieee8021
+@@ -1388,21 +1349,18 @@ static int ath9k_conf_tx(struct ieee8021
  	qi.tqi_aifs = params->aifs;
  	qi.tqi_cwmin = params->cw_min;
  	qi.tqi_cwmax = params->cw_max;
@@ -3053,7 +3153,7 @@
  	mutex_unlock(&sc->mutex);
  	ath9k_ps_restore(sc);
  
-@@ -1471,85 +1427,36 @@ static int ath9k_set_key(struct ieee8021
+@@ -1471,85 +1429,36 @@ static int ath9k_set_key(struct ieee8021
  
  	return ret;
  }
@@ -3150,7 +3250,7 @@
  	}
  }
  
-@@ -1558,6 +1465,11 @@ static void ath9k_bss_info_changed(struc
+@@ -1558,6 +1467,11 @@ static void ath9k_bss_info_changed(struc
  				   struct ieee80211_bss_conf *bss_conf,
  				   u32 changed)
  {
@@ -3162,7 +3262,7 @@
  	struct ath_softc *sc = hw->priv;
  	struct ath_hw *ah = sc->sc_ah;
  	struct ath_common *common = ath9k_hw_common(ah);
-@@ -1568,53 +1480,43 @@ static void ath9k_bss_info_changed(struc
+@@ -1568,53 +1482,43 @@ static void ath9k_bss_info_changed(struc
  	mutex_lock(&sc->mutex);
  
  	if (changed & BSS_CHANGED_ASSOC) {
@@ -3244,7 +3344,7 @@
  	}
  
  	if (changed & BSS_CHANGED_ERP_SLOT) {
-@@ -1636,8 +1538,13 @@ static void ath9k_bss_info_changed(struc
+@@ -1636,8 +1540,13 @@ static void ath9k_bss_info_changed(struc
  		}
  	}
  
@@ -3258,7 +3358,7 @@
  }
  
  static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-@@ -1866,10 +1773,11 @@ static int ath9k_tx_last_beacon(struct i
+@@ -1866,10 +1775,11 @@ static int ath9k_tx_last_beacon(struct i
  	if (!vif)
  		return 0;
  
@@ -3272,7 +3372,7 @@
  	if (!sc->beacon.tx_processed && !edma) {
  		tasklet_disable(&sc->bcon_tasklet);
  
-@@ -1923,12 +1831,29 @@ static u32 fill_chainmask(u32 cap, u32 n
+@@ -1923,12 +1833,29 @@ static u32 fill_chainmask(u32 cap, u32 n
  	return filled;
  }
  
@@ -3491,7 +3591,17 @@
  		ieee80211_stop_queue(sc->hw, q);
  		txq->stopped = true;
  	}
-@@ -2047,7 +2060,8 @@ static void ath_tx_complete(struct ath_s
+@@ -2015,6 +2028,9 @@ static void ath_tx_complete(struct ath_s
+ 
+ 	ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
+ 
++	if (sc->sc_ah->caldata)
++		sc->sc_ah->caldata->paprd_packet_sent = true;
++
+ 	if (!(tx_flags & ATH_TX_ERROR))
+ 		/* Frame was ACKed */
+ 		tx_info->flags |= IEEE80211_TX_STAT_ACK;
+@@ -2047,7 +2063,8 @@ static void ath_tx_complete(struct ath_s
  		if (WARN_ON(--txq->pending_frames < 0))
  			txq->pending_frames = 0;
  
@@ -3501,7 +3611,7 @@
  			ieee80211_wake_queue(sc->hw, q);
  			txq->stopped = false;
  		}
-@@ -2191,7 +2205,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2191,7 +2208,7 @@ static void ath_tx_processq(struct ath_s
  
  	ath_txq_lock(sc, txq);
  	for (;;) {
@@ -3510,7 +3620,7 @@
  			break;
  
  		if (list_empty(&txq->axq_q)) {
-@@ -2274,7 +2288,7 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2274,7 +2291,7 @@ void ath_tx_edma_tasklet(struct ath_soft
  	int status;
  
  	for (;;) {
@@ -4432,3 +4542,209 @@
  #define AR5K_EEPROM_N_2GHZ_CHAN		3
  #define AR5K_EEPROM_N_2GHZ_CHAN_2413	4
  #define	AR5K_EEPROM_N_2GHZ_CHAN_MAX	4
+--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+@@ -142,6 +142,7 @@ static int ar9003_paprd_setup_single_tab
+ 	};
+ 	int training_power;
+ 	int i, val;
++	u32 am2pm_mask = ah->paprd_ratemask;
+ 
+ 	if (IS_CHAN_2GHZ(ah->curchan))
+ 		training_power = ar9003_get_training_power_2g(ah);
+@@ -158,10 +159,13 @@ static int ar9003_paprd_setup_single_tab
+ 	}
+ 	ah->paprd_training_power = training_power;
+ 
++	if (AR_SREV_9330(ah))
++		am2pm_mask = 0;
++
+ 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK,
+ 		      ah->paprd_ratemask);
+ 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK,
+-		      ah->paprd_ratemask);
++		      am2pm_mask);
+ 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK,
+ 		      ah->paprd_ratemask_ht40);
+ 
+@@ -782,6 +786,102 @@ int ar9003_paprd_setup_gain_table(struct
+ }
+ EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
+ 
++static bool ar9003_paprd_retrain_pa_in(struct ath_hw *ah,
++				       struct ath9k_hw_cal_data *caldata,
++				       int chain)
++{
++	u32 *pa_in = caldata->pa_table[chain];
++	int capdiv_offset, quick_drop_offset;
++	int capdiv2g, quick_drop;
++	int count = 0;
++	int i;
++
++	if (!AR_SREV_9485(ah) && !AR_SREV_9330(ah))
++		return false;
++
++	capdiv2g = REG_READ_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,
++				  AR_PHY_65NM_CH0_TXRF3_CAPDIV2G);
++
++	quick_drop = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++				    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP);
++
++	if (quick_drop)
++		quick_drop -= 0x40;
++
++	for (i = 0; i < NUM_BIN + 1; i++) {
++		if (pa_in[i] == 1400)
++			count++;
++	}
++
++	if (AR_SREV_9485(ah)) {
++		if (pa_in[23] < 800) {
++			capdiv_offset = (int)((1000 - pa_in[23] + 75) / 150);
++			capdiv2g += capdiv_offset;
++			if (capdiv2g > 7) {
++				capdiv2g = 7;
++				if (pa_in[23] < 600) {
++					quick_drop++;
++					if (quick_drop > 0)
++						quick_drop = 0;
++				}
++			}
++		} else if (pa_in[23] == 1400) {
++			quick_drop_offset = min_t(int, count / 3, 2);
++			quick_drop += quick_drop_offset;
++			capdiv2g += quick_drop_offset / 2;
++
++			if (capdiv2g > 7)
++				capdiv2g = 7;
++
++			if (quick_drop > 0) {
++				quick_drop = 0;
++				capdiv2g -= quick_drop_offset;
++				if (capdiv2g < 0)
++					capdiv2g = 0;
++			}
++		} else {
++			return false;
++		}
++	} else if (AR_SREV_9330(ah)) {
++		if (pa_in[23] < 1000) {
++			capdiv_offset = (1000 - pa_in[23]) / 100;
++			capdiv2g += capdiv_offset;
++			if (capdiv_offset > 3) {
++				capdiv_offset = 1;
++				quick_drop--;
++			}
++
++			capdiv2g += capdiv_offset;
++			if (capdiv2g > 6)
++				capdiv2g = 6;
++			if (quick_drop < -4)
++				quick_drop = -4;
++		} else if (pa_in[23] == 1400) {
++			if (count > 3) {
++				quick_drop++;
++				capdiv2g -= count / 4;
++				if (quick_drop > -2)
++					quick_drop = -2;
++			} else {
++				capdiv2g--;
++			}
++
++			if (capdiv2g < 0)
++				capdiv2g = 0;
++		} else {
++			return false;
++		}
++	}
++
++	REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,
++		      AR_PHY_65NM_CH0_TXRF3_CAPDIV2G, capdiv2g);
++	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
++		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP,
++		      quick_drop);
++
++	return true;
++}
++
+ int ar9003_paprd_create_curve(struct ath_hw *ah,
+ 			      struct ath9k_hw_cal_data *caldata, int chain)
+ {
+@@ -817,6 +917,9 @@ int ar9003_paprd_create_curve(struct ath
+ 	if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
+ 		status = -2;
+ 
++	if (ar9003_paprd_retrain_pa_in(ah, caldata, chain))
++		status = -EINPROGRESS;
++
+ 	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
+ 		    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
+ 
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -773,15 +773,10 @@ bool ath9k_hw_intrpend(struct ath_hw *ah
+ }
+ EXPORT_SYMBOL(ath9k_hw_intrpend);
+ 
+-void ath9k_hw_disable_interrupts(struct ath_hw *ah)
++void ath9k_hw_kill_interrupts(struct ath_hw *ah)
+ {
+ 	struct ath_common *common = ath9k_hw_common(ah);
+ 
+-	if (!(ah->imask & ATH9K_INT_GLOBAL))
+-		atomic_set(&ah->intr_ref_cnt, -1);
+-	else
+-		atomic_dec(&ah->intr_ref_cnt);
+-
+ 	ath_dbg(common, INTERRUPT, "disable IER\n");
+ 	REG_WRITE(ah, AR_IER, AR_IER_DISABLE);
+ 	(void) REG_READ(ah, AR_IER);
+@@ -793,6 +788,17 @@ void ath9k_hw_disable_interrupts(struct 
+ 		(void) REG_READ(ah, AR_INTR_SYNC_ENABLE);
+ 	}
+ }
++EXPORT_SYMBOL(ath9k_hw_kill_interrupts);
++
++void ath9k_hw_disable_interrupts(struct ath_hw *ah)
++{
++	if (!(ah->imask & ATH9K_INT_GLOBAL))
++		atomic_set(&ah->intr_ref_cnt, -1);
++	else
++		atomic_dec(&ah->intr_ref_cnt);
++
++	ath9k_hw_kill_interrupts(ah);
++}
+ EXPORT_SYMBOL(ath9k_hw_disable_interrupts);
+ 
+ void ath9k_hw_enable_interrupts(struct ath_hw *ah)
+--- a/drivers/net/wireless/ath/ath9k/mac.h
++++ b/drivers/net/wireless/ath/ath9k/mac.h
+@@ -738,6 +738,7 @@ bool ath9k_hw_intrpend(struct ath_hw *ah
+ void ath9k_hw_set_interrupts(struct ath_hw *ah);
+ void ath9k_hw_enable_interrupts(struct ath_hw *ah);
+ void ath9k_hw_disable_interrupts(struct ath_hw *ah);
++void ath9k_hw_kill_interrupts(struct ath_hw *ah);
+ 
+ void ar9002_hw_attach_mac_ops(struct ath_hw *ah);
+ 
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -331,6 +331,9 @@ static int ath_pci_suspend(struct device
+ static int ath_pci_resume(struct device *device)
+ {
+ 	struct pci_dev *pdev = to_pci_dev(device);
++	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
++	struct ath_softc *sc = hw->priv;
++	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+ 	u32 val;
+ 
+ 	/*
+@@ -342,6 +345,8 @@ static int ath_pci_resume(struct device 
+ 	if ((val & 0x0000ff00) != 0)
+ 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
+ 
++	ath_pci_aspm_init(common);
++
+ 	return 0;
+ }
+ 
diff --git a/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
index 2f469b6285..7c59e1f109 100644
--- a/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,7 +8,7 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -526,8 +527,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -523,8 +524,16 @@ static int ath9k_hw_init_macaddr(struct 
  		common->macaddr[2 * i] = eeval >> 8;
  		common->macaddr[2 * i + 1] = eeval & 0xff;
  	}
diff --git a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch b/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
index 0a14d32fcf..48338db294 100644
--- a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
+++ b/package/mac80211/patches/501-ath9k-eeprom_endianess.patch
@@ -71,7 +71,7 @@
  			ath_err(common, "Reading Magic # failed\n");
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -703,6 +703,7 @@ enum ath_cal_list {
+@@ -704,6 +704,7 @@ enum ath_cal_list {
  #define AH_USE_EEPROM   0x1
  #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
  #define AH_FASTCC       0x4
diff --git a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
index 95d90ca5b8..b6591b06e9 100644
--- a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
+++ b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1952,8 +1952,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1951,8 +1951,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  		REG_WRITE(ah, AR_OBS, 8);
  
  	if (ah->config.rx_intr_mitigation) {
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
index ce41758b3e..d7a7206abb 100644
--- a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
@@ -80,7 +80,7 @@
  }
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1095,7 +1095,7 @@ static void ath9k_disable_ps(struct ath_
+@@ -1097,7 +1097,7 @@ static void ath9k_disable_ps(struct ath_
  	ath_dbg(common, PS, "PowerSave disabled\n");
  }
  
@@ -89,7 +89,7 @@
  {
  	struct ath_softc *sc = hw->priv;
  	struct ath_hw *ah = sc->sc_ah;
-@@ -1149,9 +1149,11 @@ static int ath9k_config(struct ieee80211
+@@ -1151,9 +1151,11 @@ static int ath9k_config(struct ieee80211
  
  	if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
  		struct ieee80211_channel *curchan = hw->conf.channel;
@@ -101,7 +101,7 @@
  
  		if (ah->curchan)
  			old_pos = ah->curchan - &ah->channels[0];
-@@ -1194,7 +1196,23 @@ static int ath9k_config(struct ieee80211
+@@ -1196,7 +1198,23 @@ static int ath9k_config(struct ieee80211
  			memset(&sc->survey[pos], 0, sizeof(struct survey_info));
  		}
  
diff --git a/package/mac80211/patches/521-ath9k_cur_txpower.patch b/package/mac80211/patches/521-ath9k_cur_txpower.patch
index 74688405ed..f188c8407d 100644
--- a/package/mac80211/patches/521-ath9k_cur_txpower.patch
+++ b/package/mac80211/patches/521-ath9k_cur_txpower.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1219,6 +1219,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1221,6 +1221,8 @@ int ath9k_config(struct ieee80211_hw *hw
  			return -EINVAL;
  		}
  
@@ -9,7 +9,7 @@
  		/*
  		 * The most recent snapshot of channel->noisefloor for the old
  		 * channel is only available after the hardware reset. Copy it to
-@@ -1233,6 +1235,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1235,6 +1237,7 @@ int ath9k_config(struct ieee80211_hw *hw
  		sc->config.txpowlimit = 2 * conf->power_level;
  		ath9k_cmn_update_txpow(ah, sc->curtxpow,
  				       sc->config.txpowlimit, &sc->curtxpow);
diff --git a/package/mac80211/patches/562-ath9k_add_idle_hack.patch b/package/mac80211/patches/562-ath9k_add_idle_hack.patch
index 999a7eea50..f2e2999694 100644
--- a/package/mac80211/patches/562-ath9k_add_idle_hack.patch
+++ b/package/mac80211/patches/562-ath9k_add_idle_hack.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1055,6 +1055,7 @@ static void ath9k_remove_interface(struc
+@@ -1057,6 +1057,7 @@ static void ath9k_remove_interface(struc
  	ath9k_calculate_summary_state(hw, NULL);
  
  	mutex_unlock(&sc->mutex);
@@ -8,7 +8,7 @@
  	ath9k_ps_restore(sc);
  }
  
-@@ -1107,7 +1108,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1109,7 +1110,8 @@ int ath9k_config(struct ieee80211_hw *hw
  	mutex_lock(&sc->mutex);
  
  	if (changed & IEEE80211_CONF_CHANGE_IDLE) {
diff --git a/package/mac80211/patches/564-ath9k_remove_imr_mib.patch b/package/mac80211/patches/564-ath9k_remove_imr_mib.patch
index 7869c27bc6..e444117964 100644
--- a/package/mac80211/patches/564-ath9k_remove_imr_mib.patch
+++ b/package/mac80211/patches/564-ath9k_remove_imr_mib.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -986,9 +986,6 @@ static void ath9k_hw_init_interrupt_mask
+@@ -983,9 +983,6 @@ static void ath9k_hw_init_interrupt_mask
  	else
  		imr_reg |= AR_IMR_TXOK;
  
diff --git a/package/mac80211/patches/570-ath9k_paprd_hornet_mask.patch b/package/mac80211/patches/570-ath9k_paprd_hornet_mask.patch
deleted file mode 100644
index 90e3ef2ac8..0000000000
--- a/package/mac80211/patches/570-ath9k_paprd_hornet_mask.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -142,6 +142,7 @@ static int ar9003_paprd_setup_single_tab
- 	};
- 	int training_power;
- 	int i, val;
-+	u32 am2pm_mask = ah->paprd_ratemask;
- 
- 	if (IS_CHAN_2GHZ(ah->curchan))
- 		training_power = ar9003_get_training_power_2g(ah);
-@@ -158,10 +159,13 @@ static int ar9003_paprd_setup_single_tab
- 	}
- 	ah->paprd_training_power = training_power;
- 
-+	if (AR_SREV_9330(ah))
-+		am2pm_mask = 0;
-+
- 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK,
- 		      ah->paprd_ratemask);
- 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK,
--		      ah->paprd_ratemask);
-+		      am2pm_mask);
- 	REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK,
- 		      ah->paprd_ratemask_ht40);
- 
diff --git a/package/mac80211/patches/570-mac80211_tx_status_crash.patch b/package/mac80211/patches/570-mac80211_tx_status_crash.patch
new file mode 100644
index 0000000000..abcf56e1d5
--- /dev/null
+++ b/package/mac80211/patches/570-mac80211_tx_status_crash.patch
@@ -0,0 +1,32 @@
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -517,6 +517,8 @@ void ieee80211_tx_status(struct ieee8021
+ 
+ 	if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
+ 		u64 cookie = (unsigned long)skb;
++		bool found = false;
++
+ 		acked = info->flags & IEEE80211_TX_STAT_ACK;
+ 
+ 		/*
+@@ -524,8 +526,18 @@ void ieee80211_tx_status(struct ieee8021
+ 		 * we cannot use skb->dev->ieee80211_ptr
+ 		 */
+ 
+-		if (ieee80211_is_nullfunc(hdr->frame_control) ||
+-		    ieee80211_is_qos_nullfunc(hdr->frame_control))
++		list_for_each_entry_rcu(sdata, &local->interfaces, list) {
++			if (skb->dev != sdata->dev)
++				continue;
++
++			found = true;
++			break;
++		}
++
++		if (!found)
++			skb->dev = NULL;
++		else if (ieee80211_is_nullfunc(hdr->frame_control) ||
++			 ieee80211_is_qos_nullfunc(hdr->frame_control))
+ 			cfg80211_probe_status(skb->dev, hdr->addr1,
+ 					      cookie, acked, GFP_ATOMIC);
+ 		else
diff --git a/package/mac80211/patches/571-ath9k_paprd_retrain_pa_in.patch b/package/mac80211/patches/571-ath9k_paprd_retrain_pa_in.patch
deleted file mode 100644
index 4a366e3306..0000000000
--- a/package/mac80211/patches/571-ath9k_paprd_retrain_pa_in.patch
+++ /dev/null
@@ -1,153 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -786,6 +786,102 @@ int ar9003_paprd_setup_gain_table(struct
- }
- EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
- 
-+static bool ar9003_paprd_retrain_pa_in(struct ath_hw *ah,
-+				       struct ath9k_hw_cal_data *caldata,
-+				       int chain)
-+{
-+	u32 *pa_in = caldata->pa_table[chain];
-+	int capdiv_offset, quick_drop_offset;
-+	int capdiv2g, quick_drop;
-+	int count = 0;
-+	int i;
-+
-+	if (!AR_SREV_9485(ah) && !AR_SREV_9330(ah))
-+		return false;
-+
-+	capdiv2g = REG_READ_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,
-+				  AR_PHY_65NM_CH0_TXRF3_CAPDIV2G);
-+
-+	quick_drop = REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+				    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP);
-+
-+	if (quick_drop)
-+		quick_drop -= 0x40;
-+
-+	for (i = 0; i < NUM_BIN + 1; i++) {
-+		if (pa_in[i] == 1400)
-+			count++;
-+	}
-+
-+	if (AR_SREV_9485(ah)) {
-+		if (pa_in[23] < 800) {
-+			capdiv_offset = (int)((1000 - pa_in[23] + 75) / 150);
-+			capdiv2g += capdiv_offset;
-+			if (capdiv2g > 7) {
-+				capdiv2g = 7;
-+				if (pa_in[23] < 600) {
-+					quick_drop++;
-+					if (quick_drop > 0)
-+						quick_drop = 0;
-+				}
-+			}
-+		} else if (pa_in[23] == 1400) {
-+			quick_drop_offset = min_t(int, count / 3, 2);
-+			quick_drop += quick_drop_offset;
-+			capdiv2g += quick_drop_offset / 2;
-+
-+			if (capdiv2g > 7)
-+				capdiv2g = 7;
-+
-+			if (quick_drop > 0) {
-+				quick_drop = 0;
-+				capdiv2g -= quick_drop_offset;
-+				if (capdiv2g < 0)
-+					capdiv2g = 0;
-+			}
-+		} else {
-+			return false;
-+		}
-+	} else if (AR_SREV_9330(ah)) {
-+		if (pa_in[23] < 1000) {
-+			capdiv_offset = (1000 - pa_in[23]) / 100;
-+			capdiv2g += capdiv_offset;
-+			if (capdiv_offset > 3) {
-+				capdiv_offset = 1;
-+				quick_drop--;
-+			}
-+
-+			capdiv2g += capdiv_offset;
-+			if (capdiv2g > 6)
-+				capdiv2g = 6;
-+			if (quick_drop < -4)
-+				quick_drop = -4;
-+		} else if (pa_in[23] == 1400) {
-+			if (count > 3) {
-+				quick_drop++;
-+				capdiv2g -= count / 4;
-+				if (quick_drop > -2)
-+					quick_drop = -2;
-+			} else {
-+				capdiv2g--;
-+			}
-+
-+			if (capdiv2g < 0)
-+				capdiv2g = 0;
-+		} else {
-+			return false;
-+		}
-+	}
-+
-+	REG_RMW_FIELD(ah, AR_PHY_65NM_CH0_TXRF3,
-+		      AR_PHY_65NM_CH0_TXRF3_CAPDIV2G, capdiv2g);
-+	REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+		      AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP,
-+		      quick_drop);
-+
-+	return true;
-+}
-+
- int ar9003_paprd_create_curve(struct ath_hw *ah,
- 			      struct ath9k_hw_cal_data *caldata, int chain)
- {
-@@ -821,6 +917,9 @@ int ar9003_paprd_create_curve(struct ath
- 	if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
- 		status = -2;
- 
-+	if (ar9003_paprd_retrain_pa_in(ah, caldata, chain))
-+		status = -EINPROGRESS;
-+
- 	REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
- 		    AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
- 
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -625,6 +625,10 @@
- #define AR_PHY_AIC_CTRL_4_B0	(AR_SM_BASE + 0x4c0)
- #define AR_PHY_AIC_STAT_2_B0	(AR_SM_BASE + 0x4cc)
- 
-+#define AR_PHY_65NM_CH0_TXRF3       0x16048
-+#define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G		0x0000001e
-+#define AR_PHY_65NM_CH0_TXRF3_CAPDIV2G_S	1
-+
- #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
- #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   (AR_SREV_9462(ah) ? 0x00000001 : 0x00000002)
- #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT_S (AR_SREV_9462(ah) ? 0 : 1)
---- a/drivers/net/wireless/ath/ath9k/link.c
-+++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -254,6 +254,7 @@ void ath_paprd_calibrate(struct work_str
- 	int chain_ok = 0;
- 	int chain;
- 	int len = 1800;
-+	int ret;
- 
- 	if (!caldata)
- 		return;
-@@ -302,7 +303,13 @@ void ath_paprd_calibrate(struct work_str
- 			break;
- 		}
- 
--		if (ar9003_paprd_create_curve(ah, caldata, chain)) {
-+		ret = ar9003_paprd_create_curve(ah, caldata, chain);
-+		if (ret == -EINPROGRESS) {
-+			ath_dbg(common, CALIBRATE,
-+				"PAPRD curve on chain %d needs to be re-trained\n",
-+				chain);
-+			break;
-+		} else if (ret) {
- 			ath_dbg(common, CALIBRATE,
- 				"PAPRD create curve failed on chain %d\n",
- 				chain);
diff --git a/package/mac80211/patches/572-ath9k_enable_paprd.patch b/package/mac80211/patches/572-ath9k_enable_paprd.patch
deleted file mode 100644
index ff39587f61..0000000000
--- a/package/mac80211/patches/572-ath9k_enable_paprd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -464,9 +464,6 @@ static void ath9k_hw_init_config(struct 
- 		ah->config.spurchans[i][1] = AR_NO_SPUR;
- 	}
- 
--	/* PAPRD needs some more work to be enabled */
--	ah->config.paprd_disable = 1;
--
- 	ah->config.rx_intr_mitigation = true;
- 	ah->config.pcieSerDesWrite = true;
- 
diff --git a/package/mac80211/patches/573-ath9k_fix_reset_hang.patch b/package/mac80211/patches/573-ath9k_fix_reset_hang.patch
deleted file mode 100644
index 7b4d62f3bc..0000000000
--- a/package/mac80211/patches/573-ath9k_fix_reset_hang.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/mac.c
-+++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -783,15 +783,10 @@ bool ath9k_hw_intrpend(struct ath_hw *ah
- }
- EXPORT_SYMBOL(ath9k_hw_intrpend);
- 
--void ath9k_hw_disable_interrupts(struct ath_hw *ah)
-+void ath9k_hw_kill_interrupts(struct ath_hw *ah)
- {
- 	struct ath_common *common = ath9k_hw_common(ah);
- 
--	if (!(ah->imask & ATH9K_INT_GLOBAL))
--		atomic_set(&ah->intr_ref_cnt, -1);
--	else
--		atomic_dec(&ah->intr_ref_cnt);
--
- 	ath_dbg(common, INTERRUPT, "disable IER\n");
- 	REG_WRITE(ah, AR_IER, AR_IER_DISABLE);
- 	(void) REG_READ(ah, AR_IER);
-@@ -803,6 +798,17 @@ void ath9k_hw_disable_interrupts(struct 
- 		(void) REG_READ(ah, AR_INTR_SYNC_ENABLE);
- 	}
- }
-+EXPORT_SYMBOL(ath9k_hw_kill_interrupts);
-+
-+void ath9k_hw_disable_interrupts(struct ath_hw *ah)
-+{
-+	if (!(ah->imask & ATH9K_INT_GLOBAL))
-+		atomic_set(&ah->intr_ref_cnt, -1);
-+	else
-+		atomic_dec(&ah->intr_ref_cnt);
-+
-+	ath9k_hw_kill_interrupts(ah);
-+}
- EXPORT_SYMBOL(ath9k_hw_disable_interrupts);
- 
- void ath9k_hw_enable_interrupts(struct ath_hw *ah)
---- a/drivers/net/wireless/ath/ath9k/mac.h
-+++ b/drivers/net/wireless/ath/ath9k/mac.h
-@@ -734,6 +734,7 @@ bool ath9k_hw_intrpend(struct ath_hw *ah
- void ath9k_hw_set_interrupts(struct ath_hw *ah);
- void ath9k_hw_enable_interrupts(struct ath_hw *ah);
- void ath9k_hw_disable_interrupts(struct ath_hw *ah);
-+void ath9k_hw_kill_interrupts(struct ath_hw *ah);
- 
- void ar9002_hw_attach_mac_ops(struct ath_hw *ah);
- 
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -459,8 +459,10 @@ irqreturn_t ath_isr(int irq, void *dev)
- 	if (!ath9k_hw_intrpend(ah))
- 		return IRQ_NONE;
- 
--	if(test_bit(SC_OP_HW_RESET, &sc->sc_flags))
-+	if (test_bit(SC_OP_HW_RESET, &sc->sc_flags)) {
-+		ath9k_hw_kill_interrupts(ah);
- 		return IRQ_HANDLED;
-+	}
- 
- 	/*
- 	 * Figure out the reason(s) for the interrupt.  Note
diff --git a/package/mac80211/patches/574-ath9k_fix_aspm_resume.patch b/package/mac80211/patches/574-ath9k_fix_aspm_resume.patch
deleted file mode 100644
index 31259de822..0000000000
--- a/package/mac80211/patches/574-ath9k_fix_aspm_resume.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -331,6 +331,9 @@ static int ath_pci_suspend(struct device
- static int ath_pci_resume(struct device *device)
- {
- 	struct pci_dev *pdev = to_pci_dev(device);
-+	struct ieee80211_hw *hw = pci_get_drvdata(pdev);
-+	struct ath_softc *sc = hw->priv;
-+	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
- 	u32 val;
- 
- 	/*
-@@ -342,6 +345,8 @@ static int ath_pci_resume(struct device 
- 	if ((val & 0x0000ff00) != 0)
- 		pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
- 
-+	ath_pci_aspm_init(common);
-+
- 	return 0;
- }
- 
diff --git a/package/mac80211/patches/575-ath9k_fix_paprd_crash.patch b/package/mac80211/patches/575-ath9k_fix_paprd_crash.patch
deleted file mode 100644
index 1e74a6bd24..0000000000
--- a/package/mac80211/patches/575-ath9k_fix_paprd_crash.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -404,6 +404,7 @@ struct ath9k_hw_cal_data {
- 	int8_t iCoff;
- 	int8_t qCoff;
- 	bool rtt_done;
-+	bool paprd_packet_sent;
- 	bool paprd_done;
- 	bool nfcal_pending;
- 	bool nfcal_interference;
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1780,6 +1780,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- 		/* Operating channel changed, reset channel calibration data */
- 		memset(caldata, 0, sizeof(*caldata));
- 		ath9k_init_nfcal_hist_buffer(ah, chan);
-+	} else if (caldata) {
-+		caldata->paprd_packet_sent = false;
- 	}
- 	ah->noise = ath9k_hw_getchan_noise(ah, chan);
- 
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -2028,6 +2028,9 @@ static void ath_tx_complete(struct ath_s
- 
- 	ath_dbg(common, XMIT, "TX complete: skb: %p\n", skb);
- 
-+	if (sc->sc_ah->caldata)
-+		sc->sc_ah->caldata->paprd_packet_sent = true;
-+
- 	if (!(tx_flags & ATH_TX_ERROR))
- 		/* Frame was ACKed */
- 		tx_info->flags |= IEEE80211_TX_STAT_ACK;
---- a/drivers/net/wireless/ath/ath9k/link.c
-+++ b/drivers/net/wireless/ath/ath9k/link.c
-@@ -256,7 +256,7 @@ void ath_paprd_calibrate(struct work_str
- 	int len = 1800;
- 	int ret;
- 
--	if (!caldata)
-+	if (!caldata || !caldata->paprd_packet_sent || caldata->paprd_done)
- 		return;
- 
- 	ath9k_ps_wakeup(sc);
-@@ -283,13 +283,6 @@ void ath_paprd_calibrate(struct work_str
- 			continue;
- 
- 		chain_ok = 0;
--
--		ath_dbg(common, CALIBRATE,
--			"Sending PAPRD frame for thermal measurement on chain %d\n",
--			chain);
--		if (!ath_paprd_send_frame(sc, skb, chain))
--			goto fail_paprd;
--
- 		ar9003_paprd_setup_gain_table(ah, chain);
- 
- 		ath_dbg(common, CALIBRATE,
diff --git a/package/mac80211/patches/580-mac80211_tx_status_crash.patch b/package/mac80211/patches/580-mac80211_tx_status_crash.patch
deleted file mode 100644
index abcf56e1d5..0000000000
--- a/package/mac80211/patches/580-mac80211_tx_status_crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/net/mac80211/status.c
-+++ b/net/mac80211/status.c
-@@ -517,6 +517,8 @@ void ieee80211_tx_status(struct ieee8021
- 
- 	if (info->flags & IEEE80211_TX_INTFL_NL80211_FRAME_TX) {
- 		u64 cookie = (unsigned long)skb;
-+		bool found = false;
-+
- 		acked = info->flags & IEEE80211_TX_STAT_ACK;
- 
- 		/*
-@@ -524,8 +526,18 @@ void ieee80211_tx_status(struct ieee8021
- 		 * we cannot use skb->dev->ieee80211_ptr
- 		 */
- 
--		if (ieee80211_is_nullfunc(hdr->frame_control) ||
--		    ieee80211_is_qos_nullfunc(hdr->frame_control))
-+		list_for_each_entry_rcu(sdata, &local->interfaces, list) {
-+			if (skb->dev != sdata->dev)
-+				continue;
-+
-+			found = true;
-+			break;
-+		}
-+
-+		if (!found)
-+			skb->dev = NULL;
-+		else if (ieee80211_is_nullfunc(hdr->frame_control) ||
-+			 ieee80211_is_qos_nullfunc(hdr->frame_control))
- 			cfg80211_probe_status(skb->dev, hdr->addr1,
- 					      cookie, acked, GFP_ATOMIC);
- 		else