mac80211: merge an upstream fix for an aggregation related race condition

[openwrt.git] / package / mac80211 / patches / 007-remove_misc_drivers.patch

diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index d2cb2dc..1181c42 100644 (file)
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,15 +1,15 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -199,7 +199,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -252,7 +252,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
  endif #CONFIG_WIRELESS_EXT
  
  ifdef CONFIG_STAGING
--CONFIG_COMPAT_STAGING=y
-+# CONFIG_COMPAT_STAGING=y
+-CONFIG_COMPAT_STAGING=m
++# CONFIG_COMPAT_STAGING=m
  endif #CONFIG_STAGING
  
  # mac80211 test driver
-@@ -340,13 +340,13 @@ endif #CONFIG_CRC_ITU_T
+@@ -406,13 +406,13 @@ endif #CONFIG_CRC_ITU_T
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -19,19 +19,19 @@
 +# CONFIG_ATL1=m
 +# CONFIG_ATL2=m
 +# CONFIG_ATL1E=m
- ifdef CONFIG_COMPAT_KERNEL_27
+ ifdef CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=n
 +# CONFIG_ATL1C=n
- else #CONFIG_COMPAT_KERNEL_27
+ else #CONFIG_COMPAT_KERNEL_2_6_27
 -CONFIG_ATL1C=m
 +# CONFIG_ATL1C=m
- endif #CONFIG_COMPAT_KERNEL_27
+ endif #CONFIG_COMPAT_KERNEL_2_6_27
  
  ifdef CONFIG_WIRELESS_EXT
-@@ -402,21 +402,21 @@ endif #CONFIG_COMPAT_KERNEL_29
+@@ -471,21 +471,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
  # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
  # it also requires new RNDIS_HOST and CDC_ETHER modules which we add
- ifdef CONFIG_COMPAT_KERNEL_29
+ ifdef CONFIG_COMPAT_KERNEL_2_6_29
 -CONFIG_USB_COMPAT_USBNET=n
 -CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
 -CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
@@ -40,7 +40,7 @@
 +# CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
 +# CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
 +# CONFIG_USB_NET_COMPAT_CDCETHER=n
- else #CONFIG_COMPAT_KERNEL_29
+ else #CONFIG_COMPAT_KERNEL_2_6_29
 -CONFIG_USB_COMPAT_USBNET=m
 +# CONFIG_USB_COMPAT_USBNET=m
  ifdef CONFIG_USB_NET_CDCETHER
@@ -57,6 +57,6 @@
  endif #CONFIG_USB_NET_CDCETHER
 -CONFIG_USB_NET_COMPAT_CDCETHER=m
 +# CONFIG_USB_NET_COMPAT_CDCETHER=m
- endif #CONFIG_COMPAT_KERNEL_29
+ endif #CONFIG_COMPAT_KERNEL_2_6_29