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

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 001-disable_b44.patch

diff --git a/package/mac80211/patches/001-disable_b44.patch b/package/mac80211/patches/001-disable_b44.patch
index 165e7283f48ff0125f85a40eb6f96d97a17e45bd..52564d1d8d8603faa9b45d8a0eaebed0d89ba78f 100644 (file)
--- a/package/mac80211/patches/001-disable_b44.patch
+++ b/package/mac80211/patches/001-disable_b44.patch
@@ -1,16 +1,12 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -270,10 +270,10 @@ endif
+@@ -378,8 +378,8 @@ CONFIG_B43_BCMA_PIO=y
  
  CONFIG_P54_PCI=m
  
 -CONFIG_B44=m
--CONFIG_B44_PCI_AUTOSELECT=y
--CONFIG_B44_PCICORE_AUTOSELECT=y
 -CONFIG_B44_PCI=y
 +# CONFIG_B44=m
-+# CONFIG_B44_PCI_AUTOSELECT=y
-+# CONFIG_B44_PCICORE_AUTOSELECT=y
 +# CONFIG_B44_PCI=y
  
  CONFIG_RTL8180=m