mac80211: update to 2010-06-10, add pending work with stability and throughput fixes for ath9k

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21756 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/mac80211/Makefile

@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2010-05-24
+PKG_VERSION:=2010-06-10
 PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 #	http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \
 #	http://wireless.kernel.org/download/compat-wireless-2.6
-PKG_MD5SUM:=3d465dc6e0213964d0349f61c485817f
+PKG_MD5SUM:=4074469689f7a5a0d2e038f2b5dad0bb
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)

package/mac80211/patches/001-disable_b44.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -256,8 +256,8 @@ endif
+@@ -257,8 +257,8 @@ endif
  
  CONFIG_P54_PCI=m
  

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")
-@@ -483,8 +483,8 @@ endif
+@@ -488,8 +488,8 @@ endif
  # 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

package/mac80211/patches/005-disable_ssb_build.patch

@@ -19,7 +19,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -239,21 +238,6 @@ CONFIG_IPW2200_QOS=y
+@@ -240,21 +239,6 @@ CONFIG_IPW2200_QOS=y
  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  
@@ -41,7 +41,7 @@
  CONFIG_P54_PCI=m
  
  # CONFIG_B44=m
-@@ -413,7 +397,6 @@ endif # end of SPI driver list
+@@ -418,7 +402,6 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  

package/mac80211/patches/007-remove_misc_drivers.patch

@@ -1,21 +1,25 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -270,10 +270,10 @@ endif
+@@ -271,13 +271,13 @@ endif
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
 -CONFIG_ATL1=m
 -CONFIG_ATL2=m
 -CONFIG_ATL1E=m
--CONFIG_ATL1C=m
 +# CONFIG_ATL1=m
 +# CONFIG_ATL2=m
 +# CONFIG_ATL1E=m
+ ifdef CONFIG_COMPAT_KERNEL_27
+-CONFIG_ATL1C=n
++# CONFIG_ATL1C=n
+ else
+-CONFIG_ATL1C=m
 +# CONFIG_ATL1C=m
+ endif
  
  CONFIG_HERMES=m
- CONFIG_HERMES_CACHE_FW_ON_INIT=y
+@@ -331,10 +331,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
-@@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
  CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
  CONFIG_USB_NET_COMPAT_CDCETHER=n
  else

package/mac80211/patches/010-no_pcmcia.patch

@@ -9,7 +9,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -180,7 +180,7 @@ CONFIG_B43=m
+@@ -181,7 +181,7 @@ CONFIG_B43=m
  CONFIG_B43_HWRNG=y
  CONFIG_B43_PCI_AUTOSELECT=y
  ifneq ($(CONFIG_PCMCIA),)

package/mac80211/patches/011-no_sdio.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -382,7 +382,7 @@ endif # end of SPI driver list
+@@ -387,7 +387,7 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  

package/mac80211/patches/013-disable_b43_nphy.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -184,7 +184,7 @@ ifneq ($(CONFIG_PCMCIA),)
+@@ -185,7 +185,7 @@ ifneq ($(CONFIG_PCMCIA),)
  endif
  CONFIG_B43_LEDS=y
  CONFIG_B43_PHY_LP=y

package/mac80211/patches/015-remove-rt2x00-options.patch

@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -232,12 +232,12 @@ CONFIG_RTL8180=m
+@@ -233,12 +233,12 @@ CONFIG_RTL8180=m
  
  CONFIG_ADM8211=m
  
@@ -15,9 +15,9 @@
  # CONFIG_RT2800PCI_RT30XX=y
  # CONFIG_RT2800PCI_RT35XX=y
  # CONFIG_RT2800PCI_SOC=y
-@@ -339,7 +339,7 @@ CONFIG_RT2800USB=m
+@@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y
- # CONFIG_RT2800USB_RT35XX=y
+ CONFIG_RT2800USB_RT35XX=y
- # CONFIG_RT2800USB_UNKNOWN=y
+ CONFIG_RT2800USB_UNKNOWN=y
  endif
 -CONFIG_RT2X00_LIB_USB=m
 +# CONFIG_RT2X00_LIB_USB=m

package/mac80211/patches/016-remove_pid_algo.patch

@@ -7,5 +7,5 @@
 -CONFIG_MAC80211_RC_PID=y
 +# CONFIG_MAC80211_RC_PID=y
  CONFIG_MAC80211_RC_MINSTREL=y
+ CONFIG_MAC80211_RC_MINSTREL_HT=y
  CONFIG_MAC80211_LEDS=y
- 

package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath5k/reset.c
 +++ b/drivers/net/wireless/ath/ath5k/reset.c
-@@ -1374,10 +1374,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
+@@ -1334,10 +1334,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah, 
  	 * guess we can tweak it and see how it goes ;-)
  	 */
  	if (ah->ah_version != AR5K_AR5210) {

package/mac80211/patches/300-mac80211_debugfs_debloat.patch

@@ -1,262 +0,0 @@
---- a/net/mac80211/debugfs.c
-+++ b/net/mac80211/debugfs.c
-@@ -307,9 +307,6 @@ static const struct file_operations queu
- 
- /* statistics stuff */
- 
--#define DEBUGFS_STATS_FILE(name, buflen, fmt, value...)			\
--	DEBUGFS_READONLY_FILE(stats_ ##name, buflen, fmt, ##value)
--
- static ssize_t format_devstat_counter(struct ieee80211_local *local,
- 	char __user *userbuf,
- 	size_t count, loff_t *ppos,
-@@ -351,75 +348,16 @@ static const struct file_operations stat
- 	.open = mac80211_open_file_generic,				\
- };
- 
--#define DEBUGFS_STATS_ADD(name)						\
-+#define DEBUGFS_STATS_ADD(name, field)					\
-+	debugfs_create_u32(#name, 0400, statsd, (u32 *) &field);
-+#define DEBUGFS_DEVSTATS_ADD(name)					\
- 	debugfs_create_file(#name, 0400, statsd, local, &stats_ ##name## _ops);
- 
--DEBUGFS_STATS_FILE(transmitted_fragment_count, 20, "%u",
--		   local->dot11TransmittedFragmentCount);
--DEBUGFS_STATS_FILE(multicast_transmitted_frame_count, 20, "%u",
--		   local->dot11MulticastTransmittedFrameCount);
--DEBUGFS_STATS_FILE(failed_count, 20, "%u",
--		   local->dot11FailedCount);
--DEBUGFS_STATS_FILE(retry_count, 20, "%u",
--		   local->dot11RetryCount);
--DEBUGFS_STATS_FILE(multiple_retry_count, 20, "%u",
--		   local->dot11MultipleRetryCount);
--DEBUGFS_STATS_FILE(frame_duplicate_count, 20, "%u",
--		   local->dot11FrameDuplicateCount);
--DEBUGFS_STATS_FILE(received_fragment_count, 20, "%u",
--		   local->dot11ReceivedFragmentCount);
--DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
--		   local->dot11MulticastReceivedFrameCount);
--DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
--		   local->dot11TransmittedFrameCount);
--#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
--DEBUGFS_STATS_FILE(tx_handlers_drop, 20, "%u",
--		   local->tx_handlers_drop);
--DEBUGFS_STATS_FILE(tx_handlers_queued, 20, "%u",
--		   local->tx_handlers_queued);
--DEBUGFS_STATS_FILE(tx_handlers_drop_unencrypted, 20, "%u",
--		   local->tx_handlers_drop_unencrypted);
--DEBUGFS_STATS_FILE(tx_handlers_drop_fragment, 20, "%u",
--		   local->tx_handlers_drop_fragment);
--DEBUGFS_STATS_FILE(tx_handlers_drop_wep, 20, "%u",
--		   local->tx_handlers_drop_wep);
--DEBUGFS_STATS_FILE(tx_handlers_drop_not_assoc, 20, "%u",
--		   local->tx_handlers_drop_not_assoc);
--DEBUGFS_STATS_FILE(tx_handlers_drop_unauth_port, 20, "%u",
--		   local->tx_handlers_drop_unauth_port);
--DEBUGFS_STATS_FILE(rx_handlers_drop, 20, "%u",
--		   local->rx_handlers_drop);
--DEBUGFS_STATS_FILE(rx_handlers_queued, 20, "%u",
--		   local->rx_handlers_queued);
--DEBUGFS_STATS_FILE(rx_handlers_drop_nullfunc, 20, "%u",
--		   local->rx_handlers_drop_nullfunc);
--DEBUGFS_STATS_FILE(rx_handlers_drop_defrag, 20, "%u",
--		   local->rx_handlers_drop_defrag);
--DEBUGFS_STATS_FILE(rx_handlers_drop_short, 20, "%u",
--		   local->rx_handlers_drop_short);
--DEBUGFS_STATS_FILE(rx_handlers_drop_passive_scan, 20, "%u",
--		   local->rx_handlers_drop_passive_scan);
--DEBUGFS_STATS_FILE(tx_expand_skb_head, 20, "%u",
--		   local->tx_expand_skb_head);
--DEBUGFS_STATS_FILE(tx_expand_skb_head_cloned, 20, "%u",
--		   local->tx_expand_skb_head_cloned);
--DEBUGFS_STATS_FILE(rx_expand_skb_head, 20, "%u",
--		   local->rx_expand_skb_head);
--DEBUGFS_STATS_FILE(rx_expand_skb_head2, 20, "%u",
--		   local->rx_expand_skb_head2);
--DEBUGFS_STATS_FILE(rx_handlers_fragments, 20, "%u",
--		   local->rx_handlers_fragments);
--DEBUGFS_STATS_FILE(tx_status_drop, 20, "%u",
--		   local->tx_status_drop);
--
--#endif
--
- DEBUGFS_DEVSTATS_FILE(dot11ACKFailureCount);
- DEBUGFS_DEVSTATS_FILE(dot11RTSFailureCount);
- DEBUGFS_DEVSTATS_FILE(dot11FCSErrorCount);
- DEBUGFS_DEVSTATS_FILE(dot11RTSSuccessCount);
- 
--
- void debugfs_hw_add(struct ieee80211_local *local)
- {
- 	struct dentry *phyd = local->hw.wiphy->debugfsdir;
-@@ -448,38 +386,60 @@ void debugfs_hw_add(struct ieee80211_loc
- 	if (!statsd)
- 		return;
- 
--	DEBUGFS_STATS_ADD(transmitted_fragment_count);
--	DEBUGFS_STATS_ADD(multicast_transmitted_frame_count);
--	DEBUGFS_STATS_ADD(failed_count);
--	DEBUGFS_STATS_ADD(retry_count);
--	DEBUGFS_STATS_ADD(multiple_retry_count);
--	DEBUGFS_STATS_ADD(frame_duplicate_count);
--	DEBUGFS_STATS_ADD(received_fragment_count);
--	DEBUGFS_STATS_ADD(multicast_received_frame_count);
--	DEBUGFS_STATS_ADD(transmitted_frame_count);
-+	DEBUGFS_STATS_ADD(transmitted_fragment_count,
-+		local->dot11TransmittedFragmentCount);
-+	DEBUGFS_STATS_ADD(multicast_transmitted_frame_count,
-+		local->dot11MulticastTransmittedFrameCount);
-+	DEBUGFS_STATS_ADD(failed_count, local->dot11FailedCount);
-+	DEBUGFS_STATS_ADD(retry_count, local->dot11RetryCount);
-+	DEBUGFS_STATS_ADD(multiple_retry_count,
-+		local->dot11MultipleRetryCount);
-+	DEBUGFS_STATS_ADD(frame_duplicate_count,
-+		local->dot11FrameDuplicateCount);
-+	DEBUGFS_STATS_ADD(received_fragment_count,
-+		local->dot11ReceivedFragmentCount);
-+	DEBUGFS_STATS_ADD(multicast_received_frame_count,
-+		local->dot11MulticastReceivedFrameCount);
-+	DEBUGFS_STATS_ADD(transmitted_frame_count,
-+		local->dot11TransmittedFrameCount);
- #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
--	DEBUGFS_STATS_ADD(tx_handlers_drop);
--	DEBUGFS_STATS_ADD(tx_handlers_queued);
--	DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted);
--	DEBUGFS_STATS_ADD(tx_handlers_drop_fragment);
--	DEBUGFS_STATS_ADD(tx_handlers_drop_wep);
--	DEBUGFS_STATS_ADD(tx_handlers_drop_not_assoc);
--	DEBUGFS_STATS_ADD(tx_handlers_drop_unauth_port);
--	DEBUGFS_STATS_ADD(rx_handlers_drop);
--	DEBUGFS_STATS_ADD(rx_handlers_queued);
--	DEBUGFS_STATS_ADD(rx_handlers_drop_nullfunc);
--	DEBUGFS_STATS_ADD(rx_handlers_drop_defrag);
--	DEBUGFS_STATS_ADD(rx_handlers_drop_short);
--	DEBUGFS_STATS_ADD(rx_handlers_drop_passive_scan);
--	DEBUGFS_STATS_ADD(tx_expand_skb_head);
--	DEBUGFS_STATS_ADD(tx_expand_skb_head_cloned);
--	DEBUGFS_STATS_ADD(rx_expand_skb_head);
--	DEBUGFS_STATS_ADD(rx_expand_skb_head2);
--	DEBUGFS_STATS_ADD(rx_handlers_fragments);
--	DEBUGFS_STATS_ADD(tx_status_drop);
-+	DEBUGFS_STATS_ADD(tx_handlers_drop, local->tx_handlers_drop);
-+	DEBUGFS_STATS_ADD(tx_handlers_queued, local->tx_handlers_queued);
-+	DEBUGFS_STATS_ADD(tx_handlers_drop_unencrypted,
-+		local->tx_handlers_drop_unencrypted);
-+	DEBUGFS_STATS_ADD(tx_handlers_drop_fragment,
-+		local->tx_handlers_drop_fragment);
-+	DEBUGFS_STATS_ADD(tx_handlers_drop_wep,
-+		local->tx_handlers_drop_wep);
-+	DEBUGFS_STATS_ADD(tx_handlers_drop_not_assoc,
-+		local->tx_handlers_drop_not_assoc);
-+	DEBUGFS_STATS_ADD(tx_handlers_drop_unauth_port,
-+		local->tx_handlers_drop_unauth_port);
-+	DEBUGFS_STATS_ADD(rx_handlers_drop, local->rx_handlers_drop);
-+	DEBUGFS_STATS_ADD(rx_handlers_queued, local->rx_handlers_queued);
-+	DEBUGFS_STATS_ADD(rx_handlers_drop_nullfunc,
-+		local->rx_handlers_drop_nullfunc);
-+	DEBUGFS_STATS_ADD(rx_handlers_drop_defrag,
-+		local->rx_handlers_drop_defrag);
-+	DEBUGFS_STATS_ADD(rx_handlers_drop_short,
-+		local->rx_handlers_drop_short);
-+	DEBUGFS_STATS_ADD(rx_handlers_drop_passive_scan,
-+		local->rx_handlers_drop_passive_scan);
-+	DEBUGFS_STATS_ADD(tx_expand_skb_head,
-+		local->tx_expand_skb_head);
-+	DEBUGFS_STATS_ADD(tx_expand_skb_head_cloned,
-+		local->tx_expand_skb_head_cloned);
-+	DEBUGFS_STATS_ADD(rx_expand_skb_head,
-+		local->rx_expand_skb_head);
-+	DEBUGFS_STATS_ADD(rx_expand_skb_head2,
-+		local->rx_expand_skb_head2);
-+	DEBUGFS_STATS_ADD(rx_handlers_fragments,
-+		local->rx_handlers_fragments);
-+	DEBUGFS_STATS_ADD(tx_status_drop,
-+		local->tx_status_drop);
- #endif
--	DEBUGFS_STATS_ADD(dot11ACKFailureCount);
--	DEBUGFS_STATS_ADD(dot11RTSFailureCount);
--	DEBUGFS_STATS_ADD(dot11FCSErrorCount);
--	DEBUGFS_STATS_ADD(dot11RTSSuccessCount);
-+	DEBUGFS_DEVSTATS_ADD(dot11ACKFailureCount);
-+	DEBUGFS_DEVSTATS_ADD(dot11RTSFailureCount);
-+	DEBUGFS_DEVSTATS_ADD(dot11FCSErrorCount);
-+	DEBUGFS_DEVSTATS_ADD(dot11RTSSuccessCount);
- }
---- a/net/mac80211/debugfs_sta.c
-+++ b/net/mac80211/debugfs_sta.c
-@@ -30,7 +30,6 @@ static ssize_t sta_ ##name## _read(struc
- }
- #define STA_READ_D(name, field) STA_READ(name, 20, field, "%d\n")
- #define STA_READ_U(name, field) STA_READ(name, 20, field, "%u\n")
--#define STA_READ_LU(name, field) STA_READ(name, 20, field, "%lu\n")
- #define STA_READ_S(name, field) STA_READ(name, 20, field, "%s\n")
- 
- #define STA_OPS(name)							\
-@@ -52,19 +51,7 @@ static const struct file_operations sta_
- 
- STA_FILE(aid, sta.aid, D);
- STA_FILE(dev, sdata->name, S);
--STA_FILE(rx_packets, rx_packets, LU);
--STA_FILE(tx_packets, tx_packets, LU);
--STA_FILE(rx_bytes, rx_bytes, LU);
--STA_FILE(tx_bytes, tx_bytes, LU);
--STA_FILE(rx_duplicates, num_duplicates, LU);
--STA_FILE(rx_fragments, rx_fragments, LU);
--STA_FILE(rx_dropped, rx_dropped, LU);
--STA_FILE(tx_fragments, tx_fragments, LU);
--STA_FILE(tx_filtered, tx_filtered_count, LU);
--STA_FILE(tx_retry_failed, tx_retry_failed, LU);
--STA_FILE(tx_retry_count, tx_retry_count, LU);
- STA_FILE(last_signal, last_signal, D);
--STA_FILE(wep_weak_iv_count, wep_weak_iv_count, LU);
- 
- static ssize_t sta_flags_read(struct file *file, char __user *userbuf,
- 			      size_t count, loff_t *ppos)
-@@ -307,6 +294,13 @@ STA_OPS(ht_capa);
- 	debugfs_create_file(#name, 0400, \
- 		sta->debugfs.dir, sta, &sta_ ##name## _ops);
- 
-+#define DEBUGFS_ADD_COUNTER(name, field)				\
-+	if (sizeof(sta->field) == sizeof(u32))				\
-+		debugfs_create_u32(#name, 0400, sta->debugfs.dir,	\
-+			(u32 *) &sta->field);				\
-+	else								\
-+		debugfs_create_u64(#name, 0400, sta->debugfs.dir,	\
-+			(u64 *) &sta->field);
- 
- void ieee80211_sta_debugfs_add(struct sta_info *sta)
- {
-@@ -339,20 +333,21 @@ void ieee80211_sta_debugfs_add(struct st
- 	DEBUGFS_ADD(last_seq_ctrl);
- 	DEBUGFS_ADD(agg_status);
- 	DEBUGFS_ADD(dev);
--	DEBUGFS_ADD(rx_packets);
--	DEBUGFS_ADD(tx_packets);
--	DEBUGFS_ADD(rx_bytes);
--	DEBUGFS_ADD(tx_bytes);
--	DEBUGFS_ADD(rx_duplicates);
--	DEBUGFS_ADD(rx_fragments);
--	DEBUGFS_ADD(rx_dropped);
--	DEBUGFS_ADD(tx_fragments);
--	DEBUGFS_ADD(tx_filtered);
--	DEBUGFS_ADD(tx_retry_failed);
--	DEBUGFS_ADD(tx_retry_count);
- 	DEBUGFS_ADD(last_signal);
--	DEBUGFS_ADD(wep_weak_iv_count);
- 	DEBUGFS_ADD(ht_capa);
-+
-+	DEBUGFS_ADD_COUNTER(rx_packets, rx_packets);
-+	DEBUGFS_ADD_COUNTER(tx_packets, tx_packets);
-+	DEBUGFS_ADD_COUNTER(rx_bytes, rx_bytes);
-+	DEBUGFS_ADD_COUNTER(tx_bytes, tx_bytes);
-+	DEBUGFS_ADD_COUNTER(rx_duplicates, num_duplicates);
-+	DEBUGFS_ADD_COUNTER(rx_fragments, rx_fragments);
-+	DEBUGFS_ADD_COUNTER(rx_dropped, rx_dropped);
-+	DEBUGFS_ADD_COUNTER(tx_fragments, tx_fragments);
-+	DEBUGFS_ADD_COUNTER(tx_filtered, tx_filtered_count);
-+	DEBUGFS_ADD_COUNTER(tx_retry_failed, tx_retry_failed);
-+	DEBUGFS_ADD_COUNTER(tx_retry_count, tx_retry_count);
-+	DEBUGFS_ADD_COUNTER(wep_weak_iv_count, wep_weak_iv_count);
- }
- 
- void ieee80211_sta_debugfs_remove(struct sta_info *sta)

package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch

@@ -8,7 +8,7 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -456,8 +457,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -450,8 +451,16 @@ static int ath9k_hw_init_macaddr(struct 
  		common->macaddr[2 * i] = eeval >> 8;
  		common->macaddr[2 * i + 1] = eeval & 0xff;
  	}

package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

@@ -10,7 +10,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -565,6 +565,7 @@ static int ath9k_init_softc(u16 devid, s
+@@ -556,6 +556,7 @@ static int ath9k_init_softc(u16 devid, s
  {
  	struct ath_hw *ah = NULL;
  	struct ath_common *common;
@@ -18,7 +18,7 @@
  	int ret = 0, i;
  	int csz = 0;
  
-@@ -576,6 +577,10 @@ static int ath9k_init_softc(u16 devid, s
+@@ -567,6 +568,10 @@ static int ath9k_init_softc(u16 devid, s
  	ah->hw_version.subsysid = subsysid;
  	sc->sc_ah = ah;
  
@@ -31,7 +31,7 @@
  	common->bus_ops = bus_ops;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -429,10 +429,6 @@ static void ath9k_hw_init_defaults(struc
+@@ -423,10 +423,6 @@ static void ath9k_hw_init_defaults(struc
  	ah->hw_version.magic = AR5416_MAGIC;
  	ah->hw_version.subvendorid = 0;
  

package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

@@ -11,7 +11,7 @@
  #include "hw.h"
  #include "hw-ops.h"
  #include "rc.h"
-@@ -441,18 +443,23 @@ static void ath9k_hw_init_defaults(struc
+@@ -435,18 +437,23 @@ static void ath9k_hw_init_defaults(struc
  static int ath9k_hw_init_macaddr(struct ath_hw *ah)
  {
  	struct ath_common *common = ath9k_hw_common(ah);

package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1400,7 +1400,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1398,7 +1398,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  
  	if (ah->config.rx_intr_mitigation) {
  		REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);

package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch

@@ -8,7 +8,7 @@
  #include "ath9k.h"
  
  static char *dev_info = "ath9k";
-@@ -580,6 +581,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -571,6 +572,8 @@ static int ath9k_init_softc(u16 devid, s
  	pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
  	if (!pdata)
  		ah->ah_flags |= AH_USE_EEPROM;
@@ -17,7 +17,7 @@
  
  	common = ath9k_hw_common(ah);
  	common->ops = &ath9k_common_ops;
-@@ -702,6 +705,24 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -693,6 +696,24 @@ void ath9k_set_hw_capab(struct ath_softc
  	SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -42,7 +42,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
  		    const struct ath_bus_ops *bus_ops)
  {
-@@ -720,6 +741,9 @@ int ath9k_init_device(u16 devid, struct 
+@@ -711,6 +732,9 @@ int ath9k_init_device(u16 devid, struct 
  	common = ath9k_hw_common(ah);
  	ath9k_set_hw_capab(sc, hw);
  
@@ -54,7 +54,7 @@
  			      ath9k_reg_notifier);
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -517,6 +517,8 @@ struct ath_softc {
+@@ -583,6 +583,8 @@ struct ath_softc {
  
  	int beacon_interval;
  

package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch

@@ -13,7 +13,7 @@
  		sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -392,6 +392,7 @@ void ath9k_btcoex_timer_pause(struct ath
+@@ -458,6 +458,7 @@ void ath9k_btcoex_timer_pause(struct ath
  
  #define ATH_LED_PIN_DEF 		1
  #define ATH_LED_PIN_9287		8

package/mac80211/patches/500-ath9k_use_minstrel.patch

@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -689,7 +689,11 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -677,7 +677,11 @@ void ath9k_set_hw_capab(struct ath_softc
  	hw->sta_data_size = sizeof(struct ath_node);
  	hw->vif_data_size = sizeof(struct ath_vif);
  

package/mac80211/patches/520-ath0k_hw_mcast_search.patch

@@ -1,36 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1497,6 +1497,7 @@ EXPORT_SYMBOL(ath9k_hw_keyreset);
- bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
- {
- 	u32 macHi, macLo;
-+	u32 unicast_flag = AR_KEYTABLE_VALID;
- 
- 	if (entry >= ah->caps.keycache_size) {
- 		ath_print(ath9k_hw_common(ah), ATH_DBG_FATAL,
-@@ -1505,6 +1506,16 @@ bool ath9k_hw_keysetmac(struct ath_hw *a
- 	}
- 
- 	if (mac != NULL) {
-+		/*
-+		 * AR_KEYTABLE_VALID indicates that the address is a unicast
-+		 * address, which must match the transmitter address for
-+		 * decrypting frames.
-+		 * Not setting this bit allows the hardware to use the key
-+		 * for multicast frame decryption.
-+		 */
-+		if (mac[0] & 0x01)
-+			unicast_flag = 0;
-+
- 		macHi = (mac[5] << 8) | mac[4];
- 		macLo = (mac[3] << 24) |
- 			(mac[2] << 16) |
-@@ -1517,7 +1528,7 @@ bool ath9k_hw_keysetmac(struct ath_hw *a
- 		macLo = macHi = 0;
- 	}
- 	REG_WRITE(ah, AR_KEYTABLE_MAC0(entry), macLo);
--	REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | AR_KEYTABLE_VALID);
-+	REG_WRITE(ah, AR_KEYTABLE_MAC1(entry), macHi | unicast_flag);
- 
- 	return true;
- }

package/mac80211/patches/520-ath9k_enable_ar9300.patch

@@ -0,0 +1,10 @@
+--- a/drivers/net/wireless/ath/ath9k/pci.c
++++ b/drivers/net/wireless/ath/ath9k/pci.c
+@@ -29,6 +29,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
+ 	{ PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
+ 	{ PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
+ 	{ PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
++	{ PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
+ 	{ 0 }
+ };
+ 

package/mac80211/patches/521-ath9k_common-use_mcast_search.patch

@@ -1,72 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/common.c
-+++ b/drivers/net/wireless/ath/ath9k/common.c
-@@ -211,10 +211,14 @@ static int ath_reserve_key_cache_slot_tk
- 	return -1;
- }
- 
--static int ath_reserve_key_cache_slot(struct ath_common *common)
-+static int ath_reserve_key_cache_slot(struct ath_common *common,
-+				      enum ieee80211_key_alg alg)
- {
- 	int i;
- 
-+	if (alg == ALG_TKIP)
-+		return ath_reserve_key_cache_slot_tkip(common);
-+
- 	/* First, try to find slots that would not be available for TKIP. */
- 	if (common->splitmic) {
- 		for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
-@@ -283,6 +287,7 @@ int ath9k_cmn_key_config(struct ath_comm
- 	struct ath_hw *ah = common->ah;
- 	struct ath9k_keyval hk;
- 	const u8 *mac = NULL;
-+	u8 gmac[ETH_ALEN];
- 	int ret = 0;
- 	int idx;
- 
-@@ -306,9 +311,23 @@ int ath9k_cmn_key_config(struct ath_comm
- 	memcpy(hk.kv_val, key->key, key->keylen);
- 
- 	if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
--		/* For now, use the default keys for broadcast keys. This may
--		 * need to change with virtual interfaces. */
--		idx = key->keyidx;
-+		switch (vif->type) {
-+		case NL80211_IFTYPE_AP:
-+			memcpy(gmac, vif->addr, ETH_ALEN);
-+			gmac[0] |= 0x01;
-+			mac = gmac;
-+			idx = ath_reserve_key_cache_slot(common, key->alg);
-+			break;
-+		case NL80211_IFTYPE_ADHOC:
-+			memcpy(gmac, sta->addr, ETH_ALEN);
-+			gmac[0] |= 0x01;
-+			mac = gmac;
-+			idx = ath_reserve_key_cache_slot(common, key->alg);
-+			break;
-+		default:
-+			idx = key->keyidx;
-+			break;
-+		}
- 	} else if (key->keyidx) {
- 		if (WARN_ON(!sta))
- 			return -EOPNOTSUPP;
-@@ -325,14 +344,12 @@ int ath9k_cmn_key_config(struct ath_comm
- 			return -EOPNOTSUPP;
- 		mac = sta->addr;
- 
--		if (key->alg == ALG_TKIP)
--			idx = ath_reserve_key_cache_slot_tkip(common);
--		else
--			idx = ath_reserve_key_cache_slot(common);
--		if (idx < 0)
--			return -ENOSPC; /* no free key cache entries */
-+		idx = ath_reserve_key_cache_slot(common, key->alg);
- 	}
- 
-+	if (idx < 0)
-+		return -ENOSPC; /* no free key cache entries */
-+
- 	if (key->alg == ALG_TKIP)
- 		ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,
- 				      vif->type == NL80211_IFTYPE_AP);

package/mac80211/patches/522-ath9k_remove_duplicate_code.patch

@@ -1,255 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -622,234 +622,6 @@ static u32 ath_get_extchanmode(struct at
- 	return chanmode;
- }
- 
--static int ath_setkey_tkip(struct ath_common *common, u16 keyix, const u8 *key,
--			   struct ath9k_keyval *hk, const u8 *addr,
--			   bool authenticator)
--{
--	struct ath_hw *ah = common->ah;
--	const u8 *key_rxmic;
--	const u8 *key_txmic;
--
--	key_txmic = key + NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY;
--	key_rxmic = key + NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY;
--
--	if (addr == NULL) {
--		/*
--		 * Group key installation - only two key cache entries are used
--		 * regardless of splitmic capability since group key is only
--		 * used either for TX or RX.
--		 */
--		if (authenticator) {
--			memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
--			memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_mic));
--		} else {
--			memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
--			memcpy(hk->kv_txmic, key_rxmic, sizeof(hk->kv_mic));
--		}
--		return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
--	}
--	if (!common->splitmic) {
--		/* TX and RX keys share the same key cache entry. */
--		memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
--		memcpy(hk->kv_txmic, key_txmic, sizeof(hk->kv_txmic));
--		return ath9k_hw_set_keycache_entry(ah, keyix, hk, addr);
--	}
--
--	/* Separate key cache entries for TX and RX */
--
--	/* TX key goes at first index, RX key at +32. */
--	memcpy(hk->kv_mic, key_txmic, sizeof(hk->kv_mic));
--	if (!ath9k_hw_set_keycache_entry(ah, keyix, hk, NULL)) {
--		/* TX MIC entry failed. No need to proceed further */
--		ath_print(common, ATH_DBG_FATAL,
--			  "Setting TX MIC Key Failed\n");
--		return 0;
--	}
--
--	memcpy(hk->kv_mic, key_rxmic, sizeof(hk->kv_mic));
--	/* XXX delete tx key on failure? */
--	return ath9k_hw_set_keycache_entry(ah, keyix + 32, hk, addr);
--}
--
--static int ath_reserve_key_cache_slot_tkip(struct ath_common *common)
--{
--	int i;
--
--	for (i = IEEE80211_WEP_NKID; i < common->keymax / 2; i++) {
--		if (test_bit(i, common->keymap) ||
--		    test_bit(i + 64, common->keymap))
--			continue; /* At least one part of TKIP key allocated */
--		if (common->splitmic &&
--		    (test_bit(i + 32, common->keymap) ||
--		     test_bit(i + 64 + 32, common->keymap)))
--			continue; /* At least one part of TKIP key allocated */
--
--		/* Found a free slot for a TKIP key */
--		return i;
--	}
--	return -1;
--}
--
--static int ath_reserve_key_cache_slot(struct ath_common *common)
--{
--	int i;
--
--	/* First, try to find slots that would not be available for TKIP. */
--	if (common->splitmic) {
--		for (i = IEEE80211_WEP_NKID; i < common->keymax / 4; i++) {
--			if (!test_bit(i, common->keymap) &&
--			    (test_bit(i + 32, common->keymap) ||
--			     test_bit(i + 64, common->keymap) ||
--			     test_bit(i + 64 + 32, common->keymap)))
--				return i;
--			if (!test_bit(i + 32, common->keymap) &&
--			    (test_bit(i, common->keymap) ||
--			     test_bit(i + 64, common->keymap) ||
--			     test_bit(i + 64 + 32, common->keymap)))
--				return i + 32;
--			if (!test_bit(i + 64, common->keymap) &&
--			    (test_bit(i , common->keymap) ||
--			     test_bit(i + 32, common->keymap) ||
--			     test_bit(i + 64 + 32, common->keymap)))
--				return i + 64;
--			if (!test_bit(i + 64 + 32, common->keymap) &&
--			    (test_bit(i, common->keymap) ||
--			     test_bit(i + 32, common->keymap) ||
--			     test_bit(i + 64, common->keymap)))
--				return i + 64 + 32;
--		}
--	} else {
--		for (i = IEEE80211_WEP_NKID; i < common->keymax / 2; i++) {
--			if (!test_bit(i, common->keymap) &&
--			    test_bit(i + 64, common->keymap))
--				return i;
--			if (test_bit(i, common->keymap) &&
--			    !test_bit(i + 64, common->keymap))
--				return i + 64;
--		}
--	}
--
--	/* No partially used TKIP slots, pick any available slot */
--	for (i = IEEE80211_WEP_NKID; i < common->keymax; i++) {
--		/* Do not allow slots that could be needed for TKIP group keys
--		 * to be used. This limitation could be removed if we know that
--		 * TKIP will not be used. */
--		if (i >= 64 && i < 64 + IEEE80211_WEP_NKID)
--			continue;
--		if (common->splitmic) {
--			if (i >= 32 && i < 32 + IEEE80211_WEP_NKID)
--				continue;
--			if (i >= 64 + 32 && i < 64 + 32 + IEEE80211_WEP_NKID)
--				continue;
--		}
--
--		if (!test_bit(i, common->keymap))
--			return i; /* Found a free slot for a key */
--	}
--
--	/* No free slot found */
--	return -1;
--}
--
--static int ath_key_config(struct ath_common *common,
--			  struct ieee80211_vif *vif,
--			  struct ieee80211_sta *sta,
--			  struct ieee80211_key_conf *key)
--{
--	struct ath_hw *ah = common->ah;
--	struct ath9k_keyval hk;
--	const u8 *mac = NULL;
--	int ret = 0;
--	int idx;
--
--	memset(&hk, 0, sizeof(hk));
--
--	switch (key->alg) {
--	case ALG_WEP:
--		hk.kv_type = ATH9K_CIPHER_WEP;
--		break;
--	case ALG_TKIP:
--		hk.kv_type = ATH9K_CIPHER_TKIP;
--		break;
--	case ALG_CCMP:
--		hk.kv_type = ATH9K_CIPHER_AES_CCM;
--		break;
--	default:
--		return -EOPNOTSUPP;
--	}
--
--	hk.kv_len = key->keylen;
--	memcpy(hk.kv_val, key->key, key->keylen);
--
--	if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
--		/* For now, use the default keys for broadcast keys. This may
--		 * need to change with virtual interfaces. */
--		idx = key->keyidx;
--	} else if (key->keyidx) {
--		if (WARN_ON(!sta))
--			return -EOPNOTSUPP;
--		mac = sta->addr;
--
--		if (vif->type != NL80211_IFTYPE_AP) {
--			/* Only keyidx 0 should be used with unicast key, but
--			 * allow this for client mode for now. */
--			idx = key->keyidx;
--		} else
--			return -EIO;
--	} else {
--		if (WARN_ON(!sta))
--			return -EOPNOTSUPP;
--		mac = sta->addr;
--
--		if (key->alg == ALG_TKIP)
--			idx = ath_reserve_key_cache_slot_tkip(common);
--		else
--			idx = ath_reserve_key_cache_slot(common);
--		if (idx < 0)
--			return -ENOSPC; /* no free key cache entries */
--	}
--
--	if (key->alg == ALG_TKIP)
--		ret = ath_setkey_tkip(common, idx, key->key, &hk, mac,
--				      vif->type == NL80211_IFTYPE_AP);
--	else
--		ret = ath9k_hw_set_keycache_entry(ah, idx, &hk, mac);
--
--	if (!ret)
--		return -EIO;
--
--	set_bit(idx, common->keymap);
--	if (key->alg == ALG_TKIP) {
--		set_bit(idx + 64, common->keymap);
--		if (common->splitmic) {
--			set_bit(idx + 32, common->keymap);
--			set_bit(idx + 64 + 32, common->keymap);
--		}
--	}
--
--	return idx;
--}
--
--static void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key)
--{
--	struct ath_hw *ah = common->ah;
--
--	ath9k_hw_keyreset(ah, key->hw_key_idx);
--	if (key->hw_key_idx < IEEE80211_WEP_NKID)
--		return;
--
--	clear_bit(key->hw_key_idx, common->keymap);
--	if (key->alg != ALG_TKIP)
--		return;
--
--	clear_bit(key->hw_key_idx + 64, common->keymap);
--	if (common->splitmic) {
--		ath9k_hw_keyreset(ah, key->hw_key_idx + 32);
--		clear_bit(key->hw_key_idx + 32, common->keymap);
--		clear_bit(key->hw_key_idx + 64 + 32, common->keymap);
--	}
--}
--
- static void ath9k_bss_assoc_info(struct ath_softc *sc,
- 				 struct ieee80211_vif *vif,
- 				 struct ieee80211_bss_conf *bss_conf)
-@@ -1814,7 +1586,7 @@ static int ath9k_set_key(struct ieee8021
- 
- 	switch (cmd) {
- 	case SET_KEY:
--		ret = ath_key_config(common, vif, sta, key);
-+		ret = ath9k_cmn_key_config(common, vif, sta, key);
- 		if (ret >= 0) {
- 			key->hw_key_idx = ret;
- 			/* push IV and Michael MIC generation to stack */
-@@ -1827,7 +1599,7 @@ static int ath9k_set_key(struct ieee8021
- 		}
- 		break;
- 	case DISABLE_KEY:
--		ath_key_delete(common, key);
-+		ath9k_cmn_key_delete(common, key);
- 		break;
- 	default:
- 		ret = -EINVAL;

package/mac80211/patches/530-ath9k_queue_fill.patch

@@ -1,154 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -137,6 +137,8 @@ void ath_descdma_cleanup(struct ath_soft
- #define ATH_MAX_ANTENNA         3
- #define ATH_RXBUF               512
- #define ATH_TXBUF               512
-+#define ATH_TXBUF_RESERVE       5
-+#define ATH_MAX_QDEPTH          (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
- #define ATH_TXMAXTRY            13
- #define ATH_MGT_TXMAXTRY        4
- 
-@@ -205,6 +207,7 @@ struct ath_txq {
- 	struct list_head txq_fifo_pending;
- 	u8 txq_headidx;
- 	u8 txq_tailidx;
-+	int pending_frames;
- };
- 
- struct ath_atx_ac {
-@@ -242,6 +245,7 @@ struct ath_buf {
- 	struct ath_buf_state bf_state;
- 	dma_addr_t bf_dmacontext;
- 	struct ath_wiphy *aphy;
-+	struct ath_txq *txq;
- };
- 
- struct ath_atx_tid {
-@@ -331,7 +335,6 @@ void ath_tx_node_cleanup(struct ath_soft
- void ath_txq_schedule(struct ath_softc *sc, struct ath_txq *txq);
- int ath_tx_init(struct ath_softc *sc, int nbufs);
- void ath_tx_cleanup(struct ath_softc *sc);
--struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb);
- int ath_txq_update(struct ath_softc *sc, int qnum,
- 		   struct ath9k_tx_queue_info *q);
- int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -986,32 +986,6 @@ int ath_tx_get_qnum(struct ath_softc *sc
- 	return qnum;
- }
- 
--struct ath_txq *ath_test_get_txq(struct ath_softc *sc, struct sk_buff *skb)
--{
--	struct ath_txq *txq = NULL;
--	u16 skb_queue = skb_get_queue_mapping(skb);
--	int qnum;
--
--	qnum = ath_get_hal_qnum(skb_queue, sc);
--	txq = &sc->tx.txq[qnum];
--
--	spin_lock_bh(&txq->axq_lock);
--
--	if (txq->axq_depth >= (ATH_TXBUF - 20)) {
--		ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_XMIT,
--			  "TX queue: %d is full, depth: %d\n",
--			  qnum, txq->axq_depth);
--		ath_mac80211_stop_queue(sc, skb_queue);
--		txq->stopped = 1;
--		spin_unlock_bh(&txq->axq_lock);
--		return NULL;
--	}
--
--	spin_unlock_bh(&txq->axq_lock);
--
--	return txq;
--}
--
- int ath_txq_update(struct ath_softc *sc, int qnum,
- 		   struct ath9k_tx_queue_info *qinfo)
- {
-@@ -1811,6 +1785,7 @@ int ath_tx_start(struct ieee80211_hw *hw
- 	struct ath_wiphy *aphy = hw->priv;
- 	struct ath_softc *sc = aphy->sc;
- 	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+	struct ath_txq *txq = txctl->txq;
- 	struct ath_buf *bf;
- 	int r;
- 
-@@ -1820,10 +1795,16 @@ int ath_tx_start(struct ieee80211_hw *hw
- 		return -1;
- 	}
- 
-+	bf->txq = txctl->txq;
-+	spin_lock_bh(&bf->txq->axq_lock);
-+	if (++bf->txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
-+		ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
-+		txq->stopped = 1;
-+	}
-+	spin_unlock_bh(&bf->txq->axq_lock);
-+
- 	r = ath_tx_setup_buffer(hw, bf, skb, txctl);
- 	if (unlikely(r)) {
--		struct ath_txq *txq = txctl->txq;
--
- 		ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
- 
- 		/* upon ath_tx_processq() this TX queue will be resumed, we
-@@ -1831,7 +1812,7 @@ int ath_tx_start(struct ieee80211_hw *hw
- 		 * we will at least have to run TX completionon one buffer
- 		 * on the queue */
- 		spin_lock_bh(&txq->axq_lock);
--		if (sc->tx.txq[txq->axq_qnum].axq_depth > 1) {
-+		if (!txq->stopped && txq->axq_depth > 1) {
- 			ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
- 			txq->stopped = 1;
- 		}
-@@ -1972,6 +1953,13 @@ static void ath_tx_complete_buf(struct a
- 			tx_flags |= ATH_TX_XRETRY;
- 	}
- 
-+	if (bf->txq) {
-+		spin_lock_bh(&bf->txq->axq_lock);
-+		bf->txq->pending_frames--;
-+		spin_unlock_bh(&bf->txq->axq_lock);
-+		bf->txq = NULL;
-+	}
-+
- 	dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
- 	ath_tx_complete(sc, skb, bf->aphy, tx_flags);
- 	ath_debug_stat_tx(sc, txq, bf, ts);
-@@ -2060,8 +2048,7 @@ static void ath_wake_mac80211_queue(stru
- 	int qnum;
- 
- 	spin_lock_bh(&txq->axq_lock);
--	if (txq->stopped &&
--	    sc->tx.txq[txq->axq_qnum].axq_depth <= (ATH_TXBUF - 20)) {
-+	if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
- 		qnum = ath_get_mac80211_qnum(txq->axq_qnum, sc);
- 		if (qnum != -1) {
- 			ath_mac80211_start_queue(sc, qnum);
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1026,6 +1026,7 @@ static int ath9k_tx(struct ieee80211_hw 
- 	struct ath_tx_control txctl;
- 	int padpos, padsize;
- 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-+	int qnum;
- 
- 	if (aphy->state != ATH_WIPHY_ACTIVE && aphy->state != ATH_WIPHY_SCAN) {
- 		ath_print(common, ATH_DBG_XMIT,
-@@ -1098,11 +1099,8 @@ static int ath9k_tx(struct ieee80211_hw 
- 		memmove(skb->data, skb->data + padsize, padpos);
- 	}
- 
--	/* Check if a tx queue is available */
--
--	txctl.txq = ath_test_get_txq(sc, skb);
--	if (!txctl.txq)
--		goto exit;
-+	qnum = ath_get_hal_qnum(skb_get_queue_mapping(skb), sc);
-+	txctl.txq = &sc->tx.txq[qnum];
- 
- 	ath_print(common, ATH_DBG_XMIT, "transmitting packet, skb: %p\n", skb);
- 

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
-@@ -216,6 +216,7 @@ void rt2x00pci_uninitialize(struct rt2x0
+@@ -262,6 +262,7 @@ void rt2x00pci_uninitialize(struct rt2x0
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize);
  
@@ -8,7 +8,7 @@
  /*
   * PCI driver handlers.
   */
-@@ -390,6 +391,7 @@ int rt2x00pci_resume(struct pci_dev *pci
+@@ -439,6 +440,7 @@ int rt2x00pci_resume(struct pci_dev *pci
  }
  EXPORT_SYMBOL_GPL(rt2x00pci_resume);
  #endif /* CONFIG_PM */