mac80211: update to wireless-testing 2011-04-06

adds some more pending patches which (among other things) fix the 'failed to stop RX DMA' messages

SVN-Revision: 26506

22 files changed, 362 insertions, 517 deletions

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 7e0b82413d..ddc2038d20 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2011-03-24
+PKG_VERSION:=2011-04-06
 PKG_RELEASE:=2
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
-PKG_MD5SUM:=f5713fb3ab59bdd3d0ce931b813ef960
+PKG_MD5SUM:=7ef8c2d9ee25af7ed33cf339f2484249
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
@@ -1046,6 +1046,7 @@ MAKE_OPTS:= \
 	CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \
 	CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \
 	CONFIG_IWM= \
+	CONFIG_MWIFIEX= \
 	CONFIG_MAC80211_RC_MINSTREL_HT=y \
 	MADWIFI= \
 	OLD_IWL= \
diff --git a/package/mac80211/patches/002-disable_rfkill.patch b/package/mac80211/patches/002-disable_rfkill.patch
index 2f1eac709e..2f71ccb92c 100644
--- a/package/mac80211/patches/002-disable_rfkill.patch
+++ b/package/mac80211/patches/002-disable_rfkill.patch
@@ -9,7 +9,7 @@
  
  ifeq ($(CONFIG_MAC80211),y)
  $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
-@@ -623,10 +623,10 @@ endif #CONFIG_COMPAT_KERNEL_27
+@@ -626,10 +626,10 @@ endif #CONFIG_COMPAT_KERNEL_27
  # We need the backported rfkill module on kernel < 2.6.31.
  # In more recent kernel versions use the in kernel rfkill module.
  ifdef CONFIG_COMPAT_KERNEL_31
diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index e4504e1352..9cf729beee 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -3,10 +3,10 @@
 @@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
  endif #CONFIG_WIRELESS_EXT
  
- ifneq ($(CONFIG_STAGING),)
-- CONFIG_COMPAT_STAGING=m
-+# CONFIG_COMPAT_STAGING=m
- endif
+ ifdef CONFIG_STAGING
+-CONFIG_COMPAT_STAGING=y
++# CONFIG_COMPAT_STAGING=y
+ endif #CONFIG_STAGING
  
  # mac80211 test driver
 @@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T
diff --git a/package/mac80211/patches/030-disable_tty_set_termios.patch b/package/mac80211/patches/030-disable_tty_set_termios.patch
index fc5d4d63fb..654c2a8bc7 100644
--- a/package/mac80211/patches/030-disable_tty_set_termios.patch
+++ b/package/mac80211/patches/030-disable_tty_set_termios.patch
@@ -1,14 +1,14 @@
 --- a/compat/compat-2.6.39.c
 +++ b/compat/compat-2.6.39.c
-@@ -12,6 +12,7 @@
+@@ -11,6 +11,7 @@
+ #include <linux/compat.h>
  #include <linux/tty.h>
- #include <linux/sched.h>
  
 +#ifdef CONFIG_COMPAT_BLUETOOTH
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
  /*
   *		Termios Helper Methods
-@@ -111,4 +112,4 @@ int tty_set_termios(struct tty_struct *t
+@@ -110,4 +111,4 @@ int tty_set_termios(struct tty_struct *t
  }
  EXPORT_SYMBOL_GPL(tty_set_termios);
  #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)) */
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index 4cd18b4c71..cc2b1c2be1 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1,244 +1,352 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1048,6 +1048,8 @@ static int ath9k_start(struct ieee80211_
- 		"Starting driver with initial channel: %d MHz\n",
- 		curchan->center_freq);
+@@ -324,7 +324,6 @@ static void ath_paprd_activate(struct at
+ 	if (!caldata || !caldata->paprd_done)
+ 		return;
+ 
+-	ath9k_ps_wakeup(sc);
+ 	ar9003_paprd_enable(ah, false);
+ 	for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
+ 		if (!(common->tx_chainmask & BIT(chain)))
+@@ -334,7 +333,6 @@ static void ath_paprd_activate(struct at
+ 	}
+ 
+ 	ar9003_paprd_enable(ah, true);
+-	ath9k_ps_restore(sc);
+ }
+ 
+ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
+@@ -554,8 +552,11 @@ set_timer:
+ 	if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
+ 		if (!ah->caldata->paprd_done)
+ 			ieee80211_queue_work(sc->hw, &sc->paprd_work);
+-		else if (!ah->paprd_table_write_done)
++		else if (!ah->paprd_table_write_done) {
++			ath9k_ps_wakeup(sc);
+ 			ath_paprd_activate(sc);
++			ath9k_ps_restore(sc);
++		}
+ 	}
+ }
+ 
+@@ -1376,7 +1377,6 @@ static void ath9k_calculate_summary_stat
+ 
+ 	ath9k_calculate_iter_data(hw, vif, &iter_data);
+ 
+-	ath9k_ps_wakeup(sc);
+ 	/* Set BSSID mask. */
+ 	memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
+ 	ath_hw_setbssidmask(common);
+@@ -1411,7 +1411,6 @@ static void ath9k_calculate_summary_stat
+ 	}
+ 
+ 	ath9k_hw_set_interrupts(ah, ah->imask);
+-	ath9k_ps_restore(sc);
+ 
+ 	/* Set up ANI */
+ 	if ((iter_data.naps + iter_data.nadhocs) > 0) {
+@@ -1457,6 +1456,7 @@ static int ath9k_add_interface(struct ie
+ 	struct ath_vif *avp = (void *)vif->drv_priv;
+ 	int ret = 0;
  
 +	ath9k_ps_wakeup(sc);
-+
  	mutex_lock(&sc->mutex);
  
- 	/* setup initial channel */
-@@ -1143,6 +1145,8 @@ static int ath9k_start(struct ieee80211_
- mutex_unlock:
+ 	switch (vif->type) {
+@@ -1503,6 +1503,7 @@ static int ath9k_add_interface(struct ie
+ 	ath9k_do_vif_add_setup(hw, vif);
+ out:
  	mutex_unlock(&sc->mutex);
++	ath9k_ps_restore(sc);
+ 	return ret;
+ }
+ 
+@@ -1517,6 +1518,7 @@ static int ath9k_change_interface(struct
  
+ 	ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n");
+ 	mutex_lock(&sc->mutex);
++	ath9k_ps_wakeup(sc);
+ 
+ 	/* See if new interface type is valid. */
+ 	if ((new_type == NL80211_IFTYPE_ADHOC) &&
+@@ -1546,6 +1548,7 @@ static int ath9k_change_interface(struct
+ 
+ 	ath9k_do_vif_add_setup(hw, vif);
+ out:
 +	ath9k_ps_restore(sc);
-+
- 	return r;
+ 	mutex_unlock(&sc->mutex);
+ 	return ret;
  }
+@@ -1558,6 +1561,7 @@ static void ath9k_remove_interface(struc
  
---- a/net/mac80211/ibss.c
-+++ b/net/mac80211/ibss.c
-@@ -661,7 +661,6 @@ static void ieee80211_sta_find_ibss(stru
- static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
- 					struct sk_buff *req)
- {
--	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(req);
- 	struct ieee80211_mgmt *mgmt = (void *)req->data;
- 	struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
- 	struct ieee80211_local *local = sdata->local;
-@@ -685,7 +684,7 @@ static void ieee80211_rx_mgmt_probe_req(
- 	       mgmt->bssid, tx_last_beacon);
- #endif /* CONFIG_MAC80211_IBSS_DEBUG */
- 
--	if (!tx_last_beacon && !(rx_status->rx_flags & IEEE80211_RX_RA_MATCH))
-+	if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
- 		return;
+ 	ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
  
- 	if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
---- a/net/mac80211/rc80211_minstrel_ht.c
-+++ b/net/mac80211/rc80211_minstrel_ht.c
-@@ -659,18 +659,14 @@ minstrel_ht_update_caps(void *priv, stru
- 	struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
- 	struct ieee80211_local *local = hw_to_local(mp->hw);
- 	u16 sta_cap = sta->ht_cap.cap;
-+	int n_supported = 0;
- 	int ack_dur;
- 	int stbc;
- 	int i;
++	ath9k_ps_wakeup(sc);
+ 	mutex_lock(&sc->mutex);
  
- 	/* fall back to the old minstrel for legacy stations */
--	if (!sta->ht_cap.ht_supported) {
--		msp->is_ht = false;
--		memset(&msp->legacy, 0, sizeof(msp->legacy));
--		msp->legacy.r = msp->ratelist;
--		msp->legacy.sample_table = msp->sample_table;
--		return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
--	}
-+	if (!sta->ht_cap.ht_supported)
-+		goto use_legacy;
- 
- 	BUILD_BUG_ON(ARRAY_SIZE(minstrel_mcs_groups) !=
- 		MINSTREL_MAX_STREAMS * MINSTREL_STREAM_GROUPS);
-@@ -725,7 +721,22 @@ minstrel_ht_update_caps(void *priv, stru
- 
- 		mi->groups[i].supported =
- 			mcs->rx_mask[minstrel_mcs_groups[i].streams - 1];
-+
-+		if (mi->groups[i].supported)
-+			n_supported++;
+ 	sc->nvifs--;
+@@ -1569,6 +1573,7 @@ static void ath9k_remove_interface(struc
+ 	ath9k_calculate_summary_state(hw, NULL);
+ 
+ 	mutex_unlock(&sc->mutex);
++	ath9k_ps_restore(sc);
+ }
+ 
+ static void ath9k_enable_ps(struct ath_softc *sc)
+@@ -1809,6 +1814,7 @@ static int ath9k_conf_tx(struct ieee8021
+ 
+ 	txq = sc->tx.txq_map[queue];
+ 
++	ath9k_ps_wakeup(sc);
+ 	mutex_lock(&sc->mutex);
+ 
+ 	memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
+@@ -1832,6 +1838,7 @@ static int ath9k_conf_tx(struct ieee8021
+ 			ath_beaconq_config(sc);
+ 
+ 	mutex_unlock(&sc->mutex);
++	ath9k_ps_restore(sc);
+ 
+ 	return ret;
+ }
+@@ -1908,6 +1915,7 @@ static void ath9k_bss_info_changed(struc
+ 	int slottime;
+ 	int error;
+ 
++	ath9k_ps_wakeup(sc);
+ 	mutex_lock(&sc->mutex);
+ 
+ 	if (changed & BSS_CHANGED_BSSID) {
+@@ -2008,6 +2016,7 @@ static void ath9k_bss_info_changed(struc
  	}
+ 
+ 	mutex_unlock(&sc->mutex);
++	ath9k_ps_restore(sc);
+ }
+ 
+ static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long da
+ 	tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
+ 	tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
+ 	slot = (tsftu % (intval * ATH_BCBUF)) / intval;
+-	/*
+-	 * Reverse the slot order to get slot 0 on the TBTT offset that does
+-	 * not require TSF adjustment and other slots adding
+-	 * slot/ATH_BCBUF * beacon_int to timestamp. For example, with
+-	 * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 ..
+-	 * and slot 0 is at correct offset to TBTT.
+-	 */
+-	slot = ATH_BCBUF - slot - 1;
+ 	vif = sc->beacon.bslot[slot];
+ 
+ 	ath_dbg(common, ATH_DBG_BEACON,
+@@ -708,7 +700,7 @@ void ath_beacon_config(struct ath_softc 
+ 	if (cur_conf->dtim_period == 0)
+ 		cur_conf->dtim_period = 1;
+ 
+-	switch (iftype) {
++	switch (sc->sc_ah->opmode) {
+ 	case NL80211_IFTYPE_AP:
+ 		ath_beacon_config_ap(sc, cur_conf);
+ 		break;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -1585,7 +1585,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
+ }
+ 
+ static int
+-__ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
++__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
+ {
+ 	struct ieee80211_sub_if_data *sdata = rx->sdata;
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
+@@ -1593,6 +1593,7 @@ __ieee80211_data_to_8023(struct ieee8021
+ 	struct ethhdr *ehdr;
+ 	int ret;
+ 
++	*port_control = false;
+ 	if (ieee80211_has_a4(hdr->frame_control) &&
+ 	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
+ 		return -1;
+@@ -1611,12 +1612,16 @@ __ieee80211_data_to_8023(struct ieee8021
+ 		return -1;
+ 
+ 	ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
+-	if (ret < 0 || !check_port_control)
++	if (ret < 0)
+ 		return ret;
+ 
+ 	ehdr = (struct ethhdr *) rx->skb->data;
+-	if (ehdr->h_proto != rx->sdata->control_port_protocol)
+-		return -1;
++	if (ehdr->h_proto == rx->sdata->control_port_protocol) {
++		*port_control = true;
 +
-+	if (!n_supported)
-+		goto use_legacy;
-+
-+	return;
++		if (check_port_control)
++			return -1;
++	}
+ 
+ 	return 0;
+ }
+@@ -1916,6 +1921,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
+ 	struct net_device *dev = sdata->dev;
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
+ 	__le16 fc = hdr->frame_control;
++	bool port_control;
+ 	int err;
+ 
+ 	if (unlikely(!ieee80211_is_data(hdr->frame_control)))
+@@ -1932,13 +1938,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
+ 	    sdata->vif.type == NL80211_IFTYPE_AP)
+ 		return RX_DROP_MONITOR;
+ 
+-	err = __ieee80211_data_to_8023(rx);
++	err = __ieee80211_data_to_8023(rx, &port_control);
+ 	if (unlikely(err))
+ 		return RX_DROP_UNUSABLE;
+ 
+ 	if (!ieee80211_frame_allowed(rx, fc))
+ 		return RX_DROP_MONITOR;
+ 
++	if (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
++	    unlikely(port_control) && sdata->bss) {
++		sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
++				     u.ap);
++		dev = sdata->dev;
++		rx->sdata = sdata;
++	}
 +
-+use_legacy:
-+	msp->is_ht = false;
-+	memset(&msp->legacy, 0, sizeof(msp->legacy));
-+	msp->legacy.r = msp->ratelist;
-+	msp->legacy.sample_table = msp->sample_table;
-+	return mac80211_minstrel.rate_init(priv, sband, sta, &msp->legacy);
+ 	rx->skb->dev = dev;
+ 
+ 	dev->stats.rx_packets++;
+--- a/drivers/net/wireless/ath/ath9k/recv.c
++++ b/drivers/net/wireless/ath/ath9k/recv.c
+@@ -75,7 +75,6 @@ static void ath_rx_buf_link(struct ath_s
+ 		*sc->rx.rxlink = bf->bf_daddr;
+ 
+ 	sc->rx.rxlink = &ds->ds_link;
+-	ath9k_hw_rxena(ah);
  }
  
- static void
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
-@@ -814,8 +814,8 @@ struct ieee80211_local {
- 
- 	struct rate_control_ref *rate_ctrl;
- 
--	struct crypto_blkcipher *wep_tx_tfm;
--	struct crypto_blkcipher *wep_rx_tfm;
-+	struct crypto_cipher *wep_tx_tfm;
-+	struct crypto_cipher *wep_rx_tfm;
- 	u32 wep_iv;
- 
- 	/* see iface.c */
---- a/net/mac80211/tkip.c
-+++ b/net/mac80211/tkip.c
-@@ -202,7 +202,7 @@ EXPORT_SYMBOL(ieee80211_get_tkip_key);
-  * @payload_len is the length of payload (_not_ including IV/ICV length).
-  * @ta is the transmitter addresses.
-  */
--int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
- 				struct ieee80211_key *key,
- 				u8 *pos, size_t payload_len, u8 *ta)
+ static void ath_setdefantenna(struct ath_softc *sc, u32 antenna)
+@@ -426,9 +425,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
+ 	else
+ 		rfilt |= ATH9K_RX_FILTER_BEACON;
+ 
+-	if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) ||
+-	    AR_SREV_9285_12_OR_LATER(sc->sc_ah)) &&
+-	    (sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
++	if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
+ 	    (sc->rx.rxfilter & FIF_PSPOLL))
+ 		rfilt |= ATH9K_RX_FILTER_PSPOLL;
+ 
+@@ -486,12 +483,12 @@ start_recv:
+ bool ath_stoprecv(struct ath_softc *sc)
  {
-@@ -223,7 +223,7 @@ int ieee80211_tkip_encrypt_data(struct c
-  * beginning of the buffer containing IEEE 802.11 header payload, i.e.,
-  * including IV, Ext. IV, real data, Michael MIC, ICV. @payload_len is the
-  * length of payload, including IV, Ext. IV, MIC, ICV.  */
--int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
- 				struct ieee80211_key *key,
- 				u8 *payload, size_t payload_len, u8 *ta,
- 				u8 *ra, int only_iv, int queue,
---- a/net/mac80211/tkip.h
-+++ b/net/mac80211/tkip.h
-@@ -15,7 +15,7 @@
- 
- u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16);
- 
--int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
- 				 struct ieee80211_key *key,
- 				 u8 *pos, size_t payload_len, u8 *ta);
- enum {
-@@ -24,7 +24,7 @@ enum {
- 	TKIP_DECRYPT_INVALID_KEYIDX = -2,
- 	TKIP_DECRYPT_REPLAY = -3,
- };
--int ieee80211_tkip_decrypt_data(struct crypto_blkcipher *tfm,
-+int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
- 				struct ieee80211_key *key,
- 				u8 *payload, size_t payload_len, u8 *ta,
- 				u8 *ra, int only_iv, int queue,
---- a/net/mac80211/wep.c
-+++ b/net/mac80211/wep.c
-@@ -30,17 +30,15 @@ int ieee80211_wep_init(struct ieee80211_
- 	/* start WEP IV from a random value */
- 	get_random_bytes(&local->wep_iv, WEP_IV_LEN);
- 
--	local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
--						CRYPTO_ALG_ASYNC);
-+	local->wep_tx_tfm = crypto_alloc_cipher("arc4", 0, CRYPTO_ALG_ASYNC);
- 	if (IS_ERR(local->wep_tx_tfm)) {
- 		local->wep_rx_tfm = ERR_PTR(-EINVAL);
- 		return PTR_ERR(local->wep_tx_tfm);
- 	}
+ 	struct ath_hw *ah = sc->sc_ah;
+-	bool stopped;
++	bool stopped, reset = false;
+ 
+ 	spin_lock_bh(&sc->rx.rxbuflock);
+ 	ath9k_hw_abortpcurecv(ah);
+ 	ath9k_hw_setrxfilter(ah, 0);
+-	stopped = ath9k_hw_stopdmarecv(ah);
++	stopped = ath9k_hw_stopdmarecv(ah, &reset);
  
--	local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
--						CRYPTO_ALG_ASYNC);
-+	local->wep_rx_tfm = crypto_alloc_cipher("arc4", 0, CRYPTO_ALG_ASYNC);
- 	if (IS_ERR(local->wep_rx_tfm)) {
--		crypto_free_blkcipher(local->wep_tx_tfm);
-+		crypto_free_cipher(local->wep_tx_tfm);
- 		local->wep_tx_tfm = ERR_PTR(-EINVAL);
- 		return PTR_ERR(local->wep_rx_tfm);
+ 	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
+ 		ath_edma_stop_recv(sc);
+@@ -506,7 +503,7 @@ bool ath_stoprecv(struct ath_softc *sc)
+ 			"confusing the DMA engine when we start RX up\n");
+ 		ATH_DBG_WARN_ON_ONCE(!stopped);
  	}
-@@ -51,9 +49,9 @@ int ieee80211_wep_init(struct ieee80211_
- void ieee80211_wep_free(struct ieee80211_local *local)
- {
- 	if (!IS_ERR(local->wep_tx_tfm))
--		crypto_free_blkcipher(local->wep_tx_tfm);
-+		crypto_free_cipher(local->wep_tx_tfm);
- 	if (!IS_ERR(local->wep_rx_tfm))
--		crypto_free_blkcipher(local->wep_rx_tfm);
-+		crypto_free_cipher(local->wep_rx_tfm);
+-	return stopped;
++	return stopped || reset;
  }
  
- static inline bool ieee80211_wep_weak_iv(u32 iv, int keylen)
-@@ -127,12 +125,11 @@ static void ieee80211_wep_remove_iv(stru
- /* Perform WEP encryption using given key. data buffer must have tailroom
-  * for 4-byte ICV. data_len must not include this ICV. Note: this function
-  * does _not_ add IV. data = RC4(data | CRC32(data)) */
--int ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- 			       size_t klen, u8 *data, size_t data_len)
- {
--	struct blkcipher_desc desc = { .tfm = tfm };
--	struct scatterlist sg;
- 	__le32 icv;
-+	int i;
+ void ath_flushrecv(struct ath_softc *sc)
+@@ -1767,6 +1764,7 @@ requeue:
+ 		} else {
+ 			list_move_tail(&bf->list, &sc->rx.rxbuf);
+ 			ath_rx_buf_link(sc, bf);
++			ath9k_hw_rxena(ah);
+ 		}
+ 	} while (1);
  
- 	if (IS_ERR(tfm))
- 		return -1;
-@@ -140,9 +137,9 @@ int ieee80211_wep_encrypt_data(struct cr
- 	icv = cpu_to_le32(~crc32_le(~0, data, data_len));
- 	put_unaligned(icv, (__le32 *)(data + data_len));
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1244,6 +1244,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ 	u32 saveDefAntenna;
+ 	u32 macStaId1;
+ 	u64 tsf = 0;
++	bool reset = false;
+ 	int i, r;
  
--	crypto_blkcipher_setkey(tfm, rc4key, klen);
--	sg_init_one(&sg, data, data_len + WEP_ICV_LEN);
--	crypto_blkcipher_encrypt(&desc, &sg, &sg, sg.length);
-+	crypto_cipher_setkey(tfm, rc4key, klen);
-+	for (i = 0; i < data_len + WEP_ICV_LEN; i++)
-+		crypto_cipher_encrypt_one(tfm, data + i, data + i);
+ 	ah->txchainmask = common->tx_chainmask;
+@@ -1251,11 +1252,13 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  
- 	return 0;
+ 	if ((common->bus_ops->ath_bus_type != ATH_USB) && !ah->chip_fullsleep) {
+ 		ath9k_hw_abortpcurecv(ah);
+-		if (!ath9k_hw_stopdmarecv(ah)) {
++		if (!ath9k_hw_stopdmarecv(ah, &reset)) {
+ 			ath_dbg(common, ATH_DBG_XMIT,
+ 				"Failed to stop receive dma\n");
+ 			bChannelChange = false;
+ 		}
++		if (reset)
++			bChannelChange = false;
+ 	}
+ 
+ 	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
+--- a/drivers/net/wireless/ath/ath9k/mac.c
++++ b/drivers/net/wireless/ath/ath9k/mac.c
+@@ -710,18 +710,36 @@ void ath9k_hw_abortpcurecv(struct ath_hw
  }
-@@ -186,19 +183,18 @@ int ieee80211_wep_encrypt(struct ieee802
- /* Perform WEP decryption using given key. data buffer includes encrypted
-  * payload, including 4-byte ICV, but _not_ IV. data_len must not include ICV.
-  * Return 0 on success and -1 on ICV mismatch. */
--int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- 			       size_t klen, u8 *data, size_t data_len)
+ EXPORT_SYMBOL(ath9k_hw_abortpcurecv);
+ 
+-bool ath9k_hw_stopdmarecv(struct ath_hw *ah)
++bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset)
  {
--	struct blkcipher_desc desc = { .tfm = tfm };
--	struct scatterlist sg;
- 	__le32 crc;
-+	int i;
+ #define AH_RX_STOP_DMA_TIMEOUT 10000   /* usec */
+ 	struct ath_common *common = ath9k_hw_common(ah);
++	u32 mac_status, last_mac_status = 0;
+ 	int i;
  
- 	if (IS_ERR(tfm))
- 		return -1;
++	/* Enable access to the DMA observation bus */
++	REG_WRITE(ah, AR_MACMISC,
++		  ((AR_MACMISC_DMA_OBS_LINE_8 << AR_MACMISC_DMA_OBS_S) |
++		   (AR_MACMISC_MISC_OBS_BUS_1 <<
++		    AR_MACMISC_MISC_OBS_BUS_MSB_S)));
++
+ 	REG_WRITE(ah, AR_CR, AR_CR_RXD);
+ 
+ 	/* Wait for rx enable bit to go low */
+ 	for (i = AH_RX_STOP_DMA_TIMEOUT / AH_TIME_QUANTUM; i != 0; i--) {
+ 		if ((REG_READ(ah, AR_CR) & AR_CR_RXE) == 0)
+ 			break;
++
++		if (!AR_SREV_9300_20_OR_LATER(ah)) {
++			mac_status = REG_READ(ah, AR_DMADBG_7) & 0x7f0;
++			if (mac_status == 0x1c0 && mac_status == last_mac_status) {
++				*reset = true;
++				break;
++			}
++
++			last_mac_status = mac_status;
++		}
++
+ 		udelay(AH_TIME_QUANTUM);
+ 	}
  
--	crypto_blkcipher_setkey(tfm, rc4key, klen);
--	sg_init_one(&sg, data, data_len + WEP_ICV_LEN);
--	crypto_blkcipher_decrypt(&desc, &sg, &sg, sg.length);
-+	crypto_cipher_setkey(tfm, rc4key, klen);
-+	for (i = 0; i < data_len + WEP_ICV_LEN; i++)
-+		crypto_cipher_decrypt_one(tfm, data + i, data + i);
- 
- 	crc = cpu_to_le32(~crc32_le(~0, data, data_len));
- 	if (memcmp(&crc, data + data_len, WEP_ICV_LEN) != 0)
---- a/net/mac80211/wep.h
-+++ b/net/mac80211/wep.h
-@@ -18,12 +18,12 @@
- 
- int ieee80211_wep_init(struct ieee80211_local *local);
- void ieee80211_wep_free(struct ieee80211_local *local);
--int ieee80211_wep_encrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_encrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- 				size_t klen, u8 *data, size_t data_len);
- int ieee80211_wep_encrypt(struct ieee80211_local *local,
- 			  struct sk_buff *skb,
- 			  const u8 *key, int keylen, int keyidx);
--int ieee80211_wep_decrypt_data(struct crypto_blkcipher *tfm, u8 *rc4key,
-+int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
- 			       size_t klen, u8 *data, size_t data_len);
- bool ieee80211_wep_is_weak_iv(struct sk_buff *skb, struct ieee80211_key *key);
+--- a/drivers/net/wireless/ath/ath9k/mac.h
++++ b/drivers/net/wireless/ath/ath9k/mac.h
+@@ -695,7 +695,7 @@ bool ath9k_hw_setrxabort(struct ath_hw *
+ void ath9k_hw_putrxbuf(struct ath_hw *ah, u32 rxdp);
+ void ath9k_hw_startpcureceive(struct ath_hw *ah, bool is_scanning);
+ void ath9k_hw_abortpcurecv(struct ath_hw *ah);
+-bool ath9k_hw_stopdmarecv(struct ath_hw *ah);
++bool ath9k_hw_stopdmarecv(struct ath_hw *ah, bool *reset);
+ int ath9k_hw_beaconq_setup(struct ath_hw *ah);
  
+ /* Interrupt Handling */
diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
index 3e6364c4ed..592c4982ea 100644
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,7 +8,7 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -442,8 +443,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -423,8 +424,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/510-ath9k_intr_mitigation_tweak.patch b/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
index 653f47ae6d..1c9c424507 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
-@@ -1465,8 +1465,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1449,8 +1449,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/550-ath9k_increase_bcbuf.patch b/package/mac80211/patches/511-ath9k_increase_bcbuf.patch
index ed2156ca34..981303e58e 100644
--- a/package/mac80211/patches/550-ath9k_increase_bcbuf.patch
+++ b/package/mac80211/patches/511-ath9k_increase_bcbuf.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -369,7 +369,7 @@ struct ath_vif {
+@@ -361,7 +361,7 @@ struct ath_vif {
   * number of beacon intervals, the game's up.
   */
  #define BSTUCK_THRESH           	9
@@ -11,7 +11,7 @@
  #define IEEE80211_MS_TO_TU(x)           (((x) * 1000) / 1024)
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -363,8 +363,8 @@ static void ath9k_hw_init_config(struct 
+@@ -344,8 +344,8 @@ static void ath9k_hw_init_config(struct 
  {
  	int i;
  
diff --git a/package/mac80211/patches/520-mac80211_drv_tim_override.patch b/package/mac80211/patches/520-mac80211_drv_tim_override.patch
index 475ce497c6..7b192e16ae 100644
--- a/package/mac80211/patches/520-mac80211_drv_tim_override.patch
+++ b/package/mac80211/patches/520-mac80211_drv_tim_override.patch
@@ -1,6 +1,6 @@
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -2216,6 +2216,18 @@ static inline int ieee80211_sta_ps_trans
+@@ -2227,6 +2227,18 @@ static inline int ieee80211_sta_ps_trans
  #define IEEE80211_TX_STATUS_HEADROOM	13
  
  /**
@@ -31,7 +31,7 @@
  			sta_info_clear_tim_bit(sta);
  	}
  
-@@ -902,6 +903,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
+@@ -893,6 +894,7 @@ void ieee80211_sta_ps_deliver_wakeup(str
  	struct ieee80211_local *local = sdata->local;
  	int sent, buffered;
  
@@ -39,7 +39,7 @@
  	if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
  		drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta);
  
-@@ -994,3 +996,12 @@ void ieee80211_sta_block_awake(struct ie
+@@ -985,3 +987,12 @@ void ieee80211_sta_block_awake(struct ie
  		ieee80211_queue_work(hw, &sta->drv_unblock_wk);
  }
  EXPORT_SYMBOL(ieee80211_sta_block_awake);
diff --git a/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch b/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch
index 97aaeeb851..8f6249c84c 100644
--- a/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch
+++ b/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -202,6 +202,7 @@ struct ath_atx_ac {
+@@ -200,6 +200,7 @@ struct ath_atx_ac {
  	int sched;
  	struct list_head list;
  	struct list_head tid_q;
@@ -8,7 +8,7 @@
  };
  
  struct ath_frame_info {
-@@ -259,6 +260,8 @@ struct ath_node {
+@@ -257,6 +258,8 @@ struct ath_node {
  	struct ath_atx_ac ac[WME_NUM_AC];
  	u16 maxampdu;
  	u8 mpdudensity;
@@ -17,7 +17,7 @@
  };
  
  #define AGGR_CLEANUP         BIT(1)
-@@ -340,6 +343,9 @@ int ath_tx_aggr_start(struct ath_softc *
+@@ -338,6 +341,9 @@ int ath_tx_aggr_start(struct ath_softc *
  void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
  void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
  
@@ -29,7 +29,7 @@
  /********/
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1795,6 +1795,27 @@ static int ath9k_sta_remove(struct ieee8
+@@ -1800,6 +1800,27 @@ static int ath9k_sta_remove(struct ieee8
  	return 0;
  }
  
@@ -57,7 +57,7 @@
  static int ath9k_conf_tx(struct ieee80211_hw *hw, u16 queue,
  			 const struct ieee80211_tx_queue_params *params)
  {
-@@ -2197,6 +2218,7 @@ struct ieee80211_ops ath9k_ops = {
+@@ -2206,6 +2227,7 @@ struct ieee80211_ops ath9k_ops = {
  	.configure_filter   = ath9k_configure_filter,
  	.sta_add	    = ath9k_sta_add,
  	.sta_remove	    = ath9k_sta_remove,
@@ -209,8 +209,8 @@
  
 --- a/drivers/net/wireless/ath/ath9k/hw-ops.h
 +++ b/drivers/net/wireless/ath/ath9k/hw-ops.h
-@@ -128,6 +128,11 @@ static inline void ath9k_hw_set11n_virtu
- 	ath9k_hw_ops(ah)->set11n_virtualmorefrag(ah, ds, vmf);
+@@ -122,6 +122,11 @@ static inline void ath9k_hw_set11n_burst
+ 	ath9k_hw_ops(ah)->set11n_burstduration(ah, ds, burstDuration);
  }
  
 +static inline void ath9k_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val)
@@ -223,10 +223,10 @@
  /* PHY ops */
 --- a/drivers/net/wireless/ath/ath9k/hw.h
 +++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -630,6 +630,7 @@ struct ath_hw_ops {
+@@ -626,6 +626,7 @@ struct ath_hw_ops {
+ 	void (*clr11n_aggr)(struct ath_hw *ah, void *ds);
+ 	void (*set11n_burstduration)(struct ath_hw *ah, void *ds,
  				     u32 burstDuration);
- 	void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds,
- 				       u32 vmf);
 +	void (*set_clrdmask)(struct ath_hw *ah, void *ds, bool val);
  };
  
@@ -258,10 +258,10 @@
  static void ar9002_hw_set11n_ratescenario(struct ath_hw *ah, void *ds,
  					  void *lastds,
  					  u32 durUpdateEn, u32 rtsctsRate,
-@@ -460,4 +469,5 @@ void ar9002_hw_attach_mac_ops(struct ath
+@@ -448,4 +457,5 @@ void ar9002_hw_attach_mac_ops(struct ath
+ 	ops->set11n_aggr_last = ar9002_hw_set11n_aggr_last;
  	ops->clr11n_aggr = ar9002_hw_clr11n_aggr;
  	ops->set11n_burstduration = ar9002_hw_set11n_burstduration;
- 	ops->set11n_virtualmorefrag = ar9002_hw_set11n_virtualmorefrag;
 +	ops->set_clrdmask = ar9002_hw_set_clrdmask;
  }
 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
@@ -291,10 +291,10 @@
  static void ar9003_hw_set11n_ratescenario(struct ath_hw *ah, void *ds,
  					  void *lastds,
  					  u32 durUpdateEn, u32 rtsctsRate,
-@@ -522,6 +531,7 @@ void ar9003_hw_attach_mac_ops(struct ath
+@@ -510,6 +519,7 @@ void ar9003_hw_attach_mac_ops(struct ath
+ 	ops->set11n_aggr_last = ar9003_hw_set11n_aggr_last;
  	ops->clr11n_aggr = ar9003_hw_clr11n_aggr;
  	ops->set11n_burstduration = ar9003_hw_set11n_burstduration;
- 	ops->set11n_virtualmorefrag = ar9003_hw_set11n_virtualmorefrag;
 +	ops->set_clrdmask = ar9003_hw_set_clrdmask;
  }
  
diff --git a/package/mac80211/patches/522-ath9k_fix_pspoll_recv.patch b/package/mac80211/patches/522-ath9k_fix_pspoll_recv.patch
deleted file mode 100644
index 35f9f7f5e5..0000000000
--- a/package/mac80211/patches/522-ath9k_fix_pspoll_recv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/recv.c
-+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -426,9 +426,7 @@ u32 ath_calcrxfilter(struct ath_softc *s
- 	else
- 		rfilt |= ATH9K_RX_FILTER_BEACON;
- 
--	if ((AR_SREV_9280_20_OR_LATER(sc->sc_ah) ||
--	    AR_SREV_9285_12_OR_LATER(sc->sc_ah)) &&
--	    (sc->sc_ah->opmode == NL80211_IFTYPE_AP) &&
-+	if ((sc->sc_ah->opmode == NL80211_IFTYPE_AP) ||
- 	    (sc->rx.rxfilter & FIF_PSPOLL))
- 		rfilt |= ATH9K_RX_FILTER_PSPOLL;
- 
diff --git a/package/mac80211/patches/542-mac80211_minstrel_ht_aggr_delay.patch b/package/mac80211/patches/530-mac80211_minstrel_ht_aggr_delay.patch
index c0a6bf3ffd..c0a6bf3ffd 100644
--- a/package/mac80211/patches/542-mac80211_minstrel_ht_aggr_delay.patch
+++ b/package/mac80211/patches/530-mac80211_minstrel_ht_aggr_delay.patch
diff --git a/package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch b/package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch
deleted file mode 100644
index c956a20580..0000000000
--- a/package/mac80211/patches/530-mac80211_redirect_vlan_eap_frames.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -1584,7 +1584,7 @@ ieee80211_drop_unencrypted_mgmt(struct i
- }
- 
- static int
--__ieee80211_data_to_8023(struct ieee80211_rx_data *rx)
-+__ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control)
- {
- 	struct ieee80211_sub_if_data *sdata = rx->sdata;
- 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
-@@ -1592,6 +1592,7 @@ __ieee80211_data_to_8023(struct ieee8021
- 	struct ethhdr *ehdr;
- 	int ret;
- 
-+	*port_control = false;
- 	if (ieee80211_has_a4(hdr->frame_control) &&
- 	    sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta)
- 		return -1;
-@@ -1610,11 +1611,14 @@ __ieee80211_data_to_8023(struct ieee8021
- 		return -1;
- 
- 	ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type);
--	if (ret < 0 || !check_port_control)
-+	if (ret < 0)
- 		return ret;
- 
- 	ehdr = (struct ethhdr *) rx->skb->data;
--	if (ehdr->h_proto != rx->sdata->control_port_protocol)
-+	if (ehdr->h_proto == rx->sdata->control_port_protocol)
-+		*port_control = true;
-+
-+	if (check_port_control && !*port_control)
- 		return -1;
- 
- 	return 0;
-@@ -1915,6 +1919,7 @@ ieee80211_rx_h_data(struct ieee80211_rx_
- 	struct net_device *dev = sdata->dev;
- 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data;
- 	__le16 fc = hdr->frame_control;
-+	bool port_control;
- 	int err;
- 
- 	if (unlikely(!ieee80211_is_data(hdr->frame_control)))
-@@ -1931,13 +1936,21 @@ ieee80211_rx_h_data(struct ieee80211_rx_
- 	    sdata->vif.type == NL80211_IFTYPE_AP)
- 		return RX_DROP_MONITOR;
- 
--	err = __ieee80211_data_to_8023(rx);
-+	err = __ieee80211_data_to_8023(rx, &port_control);
- 	if (unlikely(err))
- 		return RX_DROP_UNUSABLE;
- 
- 	if (!ieee80211_frame_allowed(rx, fc))
- 		return RX_DROP_MONITOR;
- 
-+	if (rx->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
-+	    unlikely(port_control) && sdata->bss) {
-+		sdata = container_of(sdata->bss, struct ieee80211_sub_if_data,
-+				     u.ap);
-+		dev = sdata->dev;
-+		rx->sdata = sdata;
-+	}
-+
- 	rx->skb->dev = dev;
- 
- 	dev->stats.rx_packets++;
diff --git a/package/mac80211/patches/560-ath9k_fix_reported_signal_strength.patch b/package/mac80211/patches/540-ath9k_fix_reported_signal_strength.patch
index 2753c8705b..9e188fc627 100644
--- a/package/mac80211/patches/560-ath9k_fix_reported_signal_strength.patch
+++ b/package/mac80211/patches/540-ath9k_fix_reported_signal_strength.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -957,6 +957,9 @@ static int ath9k_rx_skb_preprocess(struc
+@@ -956,6 +956,9 @@ static int ath9k_rx_skb_preprocess(struc
  				   struct ieee80211_rx_status *rx_status,
  				   bool *decrypt_error)
  {
@@ -10,7 +10,7 @@
  	memset(rx_status, 0, sizeof(struct ieee80211_rx_status));
  
  	/*
-@@ -977,7 +980,13 @@ static int ath9k_rx_skb_preprocess(struc
+@@ -976,7 +979,13 @@ static int ath9k_rx_skb_preprocess(struc
  
  	rx_status->band = hw->conf.channel->band;
  	rx_status->freq = hw->conf.channel->center_freq;
diff --git a/package/mac80211/patches/540-mac80211_fix_rx_reorder_timeout.patch b/package/mac80211/patches/540-mac80211_fix_rx_reorder_timeout.patch
deleted file mode 100644
index c3532b4a36..0000000000
--- a/package/mac80211/patches/540-mac80211_fix_rx_reorder_timeout.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -613,7 +613,7 @@ static void ieee80211_sta_reorder_releas
- 				continue;
- 			}
- 			if (!time_after(jiffies, tid_agg_rx->reorder_time[j] +
--					HT_RX_REORDER_BUF_TIMEOUT))
-+					HT_RX_REORDER_BUF_TIMEOUT) && skipped)
- 				goto set_release_timer;
- 
- #ifdef CONFIG_MAC80211_HT_DEBUG
diff --git a/package/mac80211/patches/541-mac80211_fix_duplicate_probereq.patch b/package/mac80211/patches/541-mac80211_fix_duplicate_probereq.patch
deleted file mode 100644
index 55198b445c..0000000000
--- a/package/mac80211/patches/541-mac80211_fix_duplicate_probereq.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -2555,7 +2555,6 @@ static void ieee80211_rx_handlers(struct
- 		 * same TID from the same station
- 		 */
- 		rx->skb = skb;
--		rx->flags = 0;
- 
- 		CALL_RXH(ieee80211_rx_h_decrypt)
- 		CALL_RXH(ieee80211_rx_h_check_more_data)
-@@ -2626,6 +2625,7 @@ void ieee80211_release_reorder_timeout(s
- 		.sdata = sta->sdata,
- 		.local = sta->local,
- 		.queue = tid,
-+		.flags = 0,
- 	};
- 	struct tid_ampdu_rx *tid_agg_rx;
- 
diff --git a/package/mac80211/patches/570-ath9k_fix_ibss_beacon_slot.patch b/package/mac80211/patches/570-ath9k_fix_ibss_beacon_slot.patch
deleted file mode 100644
index 50a5bc1182..0000000000
--- a/package/mac80211/patches/570-ath9k_fix_ibss_beacon_slot.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -392,14 +392,6 @@ void ath_beacon_tasklet(unsigned long da
- 	tsf += TU_TO_USEC(ah->config.sw_beacon_response_time);
- 	tsftu = TSF_TO_TU((tsf * ATH_BCBUF) >>32, tsf * ATH_BCBUF);
- 	slot = (tsftu % (intval * ATH_BCBUF)) / intval;
--	/*
--	 * Reverse the slot order to get slot 0 on the TBTT offset that does
--	 * not require TSF adjustment and other slots adding
--	 * slot/ATH_BCBUF * beacon_int to timestamp. For example, with
--	 * ATH_BCBUF = 4, we process beacon slots as follows: 3 2 1 0 3 2 1 ..
--	 * and slot 0 is at correct offset to TBTT.
--	 */
--	slot = ATH_BCBUF - slot - 1;
- 	vif = sc->beacon.bslot[slot];
- 
- 	ath_dbg(common, ATH_DBG_BEACON,
diff --git a/package/mac80211/patches/571-ath9k_fix_beacon_config_mode.patch b/package/mac80211/patches/571-ath9k_fix_beacon_config_mode.patch
deleted file mode 100644
index 4ba74f86dc..0000000000
--- a/package/mac80211/patches/571-ath9k_fix_beacon_config_mode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -700,7 +700,7 @@ void ath_beacon_config(struct ath_softc 
- 	if (cur_conf->dtim_period == 0)
- 		cur_conf->dtim_period = 1;
- 
--	switch (iftype) {
-+	switch (sc->sc_ah->opmode) {
- 	case NL80211_IFTYPE_AP:
- 		ath_beacon_config_ap(sc, cur_conf);
- 		break;
diff --git a/package/mac80211/patches/580-ath9k_fix_ps_wakeup.patch b/package/mac80211/patches/580-ath9k_fix_ps_wakeup.patch
deleted file mode 100644
index fc0d1c84f3..0000000000
--- a/package/mac80211/patches/580-ath9k_fix_ps_wakeup.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -324,7 +324,6 @@ static void ath_paprd_activate(struct at
- 	if (!caldata || !caldata->paprd_done)
- 		return;
- 
--	ath9k_ps_wakeup(sc);
- 	ar9003_paprd_enable(ah, false);
- 	for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
- 		if (!(common->tx_chainmask & BIT(chain)))
-@@ -334,7 +333,6 @@ static void ath_paprd_activate(struct at
- 	}
- 
- 	ar9003_paprd_enable(ah, true);
--	ath9k_ps_restore(sc);
- }
- 
- static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int chain)
-@@ -554,8 +552,11 @@ set_timer:
- 	if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) && ah->caldata) {
- 		if (!ah->caldata->paprd_done)
- 			ieee80211_queue_work(sc->hw, &sc->paprd_work);
--		else if (!ah->paprd_table_write_done)
-+		else if (!ah->paprd_table_write_done) {
-+			ath9k_ps_wakeup(sc);
- 			ath_paprd_activate(sc);
-+			ath9k_ps_restore(sc);
-+		}
- 	}
- }
- 
-@@ -1376,7 +1377,6 @@ static void ath9k_calculate_summary_stat
- 
- 	ath9k_calculate_iter_data(hw, vif, &iter_data);
- 
--	ath9k_ps_wakeup(sc);
- 	/* Set BSSID mask. */
- 	memcpy(common->bssidmask, iter_data.mask, ETH_ALEN);
- 	ath_hw_setbssidmask(common);
-@@ -1411,7 +1411,6 @@ static void ath9k_calculate_summary_stat
- 	}
- 
- 	ath9k_hw_set_interrupts(ah, ah->imask);
--	ath9k_ps_restore(sc);
- 
- 	/* Set up ANI */
- 	if ((iter_data.naps + iter_data.nadhocs) > 0) {
-@@ -1457,6 +1456,7 @@ static int ath9k_add_interface(struct ie
- 	struct ath_vif *avp = (void *)vif->drv_priv;
- 	int ret = 0;
- 
-+	ath9k_ps_wakeup(sc);
- 	mutex_lock(&sc->mutex);
- 
- 	switch (vif->type) {
-@@ -1503,6 +1503,7 @@ static int ath9k_add_interface(struct ie
- 	ath9k_do_vif_add_setup(hw, vif);
- out:
- 	mutex_unlock(&sc->mutex);
-+	ath9k_ps_restore(sc);
- 	return ret;
- }
- 
-@@ -1517,6 +1518,7 @@ static int ath9k_change_interface(struct
- 
- 	ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n");
- 	mutex_lock(&sc->mutex);
-+	ath9k_ps_wakeup(sc);
- 
- 	/* See if new interface type is valid. */
- 	if ((new_type == NL80211_IFTYPE_ADHOC) &&
-@@ -1546,6 +1548,7 @@ static int ath9k_change_interface(struct
- 
- 	ath9k_do_vif_add_setup(hw, vif);
- out:
-+	ath9k_ps_restore(sc);
- 	mutex_unlock(&sc->mutex);
- 	return ret;
- }
-@@ -1558,6 +1561,7 @@ static void ath9k_remove_interface(struc
- 
- 	ath_dbg(common, ATH_DBG_CONFIG, "Detach Interface\n");
- 
-+	ath9k_ps_wakeup(sc);
- 	mutex_lock(&sc->mutex);
- 
- 	sc->nvifs--;
-@@ -1569,6 +1573,7 @@ static void ath9k_remove_interface(struc
- 	ath9k_calculate_summary_state(hw, NULL);
- 
- 	mutex_unlock(&sc->mutex);
-+	ath9k_ps_restore(sc);
- }
- 
- static void ath9k_enable_ps(struct ath_softc *sc)
-@@ -1830,6 +1835,7 @@ static int ath9k_conf_tx(struct ieee8021
- 
- 	txq = sc->tx.txq_map[queue];
- 
-+	ath9k_ps_wakeup(sc);
- 	mutex_lock(&sc->mutex);
- 
- 	memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
-@@ -1853,6 +1859,7 @@ static int ath9k_conf_tx(struct ieee8021
- 			ath_beaconq_config(sc);
- 
- 	mutex_unlock(&sc->mutex);
-+	ath9k_ps_restore(sc);
- 
- 	return ret;
- }
-@@ -1929,6 +1936,7 @@ static void ath9k_bss_info_changed(struc
- 	int slottime;
- 	int error;
- 
-+	ath9k_ps_wakeup(sc);
- 	mutex_lock(&sc->mutex);
- 
- 	if (changed & BSS_CHANGED_BSSID) {
-@@ -2029,6 +2037,7 @@ static void ath9k_bss_info_changed(struc
- 	}
- 
- 	mutex_unlock(&sc->mutex);
-+	ath9k_ps_restore(sc);
- }
- 
- static u64 ath9k_get_tsf(struct ieee80211_hw *hw)
diff --git a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
index f1b71e1266..2b5f5c250c 100644
--- a/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
+++ b/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -196,6 +196,7 @@ void rt2x00pci_uninitialize(struct rt2x0
+@@ -199,6 +199,7 @@ void rt2x00pci_uninitialize(struct rt2x0
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
  
@@ -8,7 +8,7 @@
  /*
   * PCI driver handlers.
   */
-@@ -372,6 +373,7 @@ int rt2x00pci_resume(struct pci_dev *pci
+@@ -375,6 +376,7 @@ int rt2x00pci_resume(struct pci_dev *pci
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_resume);
  #endif /* CONFIG_PM */
diff --git a/package/mac80211/patches/610-set_pci_mwi.patch b/package/mac80211/patches/610-set_pci_mwi.patch
index 8cdcac2586..00e1d4933e 100644
--- a/package/mac80211/patches/610-set_pci_mwi.patch
+++ b/package/mac80211/patches/610-set_pci_mwi.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -261,8 +261,10 @@ int rt2x00pci_probe(struct pci_dev *pci_
+@@ -264,8 +264,10 @@ int rt2x00pci_probe(struct pci_dev *pci_
  
  	pci_set_master(pci_dev);
  
diff --git a/package/mac80211/patches/620-rt2x00_soc_led_support.patch b/package/mac80211/patches/620-rt2x00_soc_led_support.patch
index 2b87b346d3..ca08ae65a7 100644
--- a/package/mac80211/patches/620-rt2x00_soc_led_support.patch
+++ b/package/mac80211/patches/620-rt2x00_soc_led_support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -935,6 +935,7 @@
+@@ -938,6 +938,7 @@ EXPORT_SYMBOL_GPL(rt2800_rfkill_poll);
  static void rt2800_brightness_set(struct led_classdev *led_cdev,
  				  enum led_brightness brightness)
  {
@@ -8,10 +8,10 @@
  	struct rt2x00_led *led =
  	    container_of(led_cdev, struct rt2x00_led, led_dev);
  	unsigned int enabled = brightness != LED_OFF;
-@@ -947,24 +948,46 @@
+@@ -950,24 +951,46 @@ static void rt2800_brightness_set(struct
  		rt2x00_get_field16(led->rt2x00dev->led_mcu_reg,
  				   EEPROM_FREQ_LED_MODE);
-
+ 
 -	if (led->type == LED_TYPE_RADIO) {
 -		rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
 -				      enabled ? 0x20 : 0);
@@ -72,4 +72,4 @@
 +		}
  	}
  }
-
+