[package] mac80211: add deadlock fix patch

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

diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch
index fca00f7..5f6fbf9 100644 (file)
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
 --- a/config.mk
 +++ b/config.mk

-@@ -153,10 +153,10 @@ CONFIG_CFG80211_DEFAULT_PS=y
+@@ -153,77 +153,77 @@ CONFIG_CFG80211_DEFAULT_PS=y

  CONFIG_CFG80211_DEFAULT_PS_VALUE=1
  # CONFIG_CFG80211_REG_DEBUG=y
  
  CONFIG_CFG80211_DEFAULT_PS_VALUE=1
  # CONFIG_CFG80211_REG_DEBUG=y
  


@@ -15,13 +15,21 @@
  # CONFIG_LIB80211_DEBUG=y
  
  CONFIG_WIRELESS_OLD_REGULATORY=n
  # CONFIG_LIB80211_DEBUG=y
  
  CONFIG_WIRELESS_OLD_REGULATORY=n

-@@ -169,61 +169,61 @@ ifneq ($(CONFIG_PCI),)

  
  

- CONFIG_ATH5K=m
+ # mac80211 test driver
+-CONFIG_MAC80211_HWSIM=m
++# CONFIG_MAC80211_HWSIM=m
+ 
+ # PCI Drivers
+ ifneq ($(CONFIG_PCI),)
+ 
+-CONFIG_ATH5K=m
++# CONFIG_ATH5K=m

  # CONFIG_ATH5K_DEBUG=y
 -CONFIG_ATH5K_RFKILL=y
  # CONFIG_ATH5K_DEBUG=y
 -CONFIG_ATH5K_RFKILL=y

+-CONFIG_ATH9K=m

 +# CONFIG_ATH5K_RFKILL=y
 +# CONFIG_ATH5K_RFKILL=y

- CONFIG_ATH9K=m
++# CONFIG_ATH9K=m

  # CONFIG_ATH9K_DEBUG=y
  
  
  # CONFIG_ATH9K_DEBUG=y
  
  


@@ -112,7 +120,7 @@
  # CONFIG_IPW2200_DEBUG=y
  # The above enables use a second interface prefixed 'rtap'.
  #           Example usage:
  # CONFIG_IPW2200_DEBUG=y
  # The above enables use a second interface prefixed 'rtap'.
  #           Example usage:

-@@ -238,27 +238,27 @@ CONFIG_IPW2200_QOS=y
+@@ -238,46 +238,46 @@ CONFIG_IPW2200_QOS=y

  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  
  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  


@@ -134,7 +142,8 @@
 +# CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 +# CONFIG_SSB_DRIVER_PCICORE=y
  
 +# CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 +# CONFIG_SSB_DRIVER_PCICORE=y
  

- CONFIG_P54_PCI=m
+-CONFIG_P54_PCI=m
++# CONFIG_P54_PCI=m

  
 -CONFIG_B44=m
 -CONFIG_B44_PCI_AUTOSELECT=y
  
 -CONFIG_B44=m
 -CONFIG_B44_PCI_AUTOSELECT=y


@@ -145,16 +154,30 @@
 +# CONFIG_B44_PCICORE_AUTOSELECT=y
 +# CONFIG_B44_PCI=y
  
 +# CONFIG_B44_PCICORE_AUTOSELECT=y
 +# CONFIG_B44_PCI=y
  

- CONFIG_RTL8180=m
+-CONFIG_RTL8180=m
++# CONFIG_RTL8180=m

  
 -CONFIG_ADM8211=m
 -CONFIG_PCMCIA_ATMEL=m
 +# CONFIG_ADM8211=m
 +# CONFIG_PCMCIA_ATMEL=m
  
  
 -CONFIG_ADM8211=m
 -CONFIG_PCMCIA_ATMEL=m
 +# CONFIG_ADM8211=m
 +# CONFIG_PCMCIA_ATMEL=m
  

- CONFIG_RT2X00_LIB_PCI=m
- CONFIG_RT2400PCI=m
-@@ -274,10 +274,10 @@ CONFIG_RT61PCI=m
+-CONFIG_RT2X00_LIB_PCI=m
+-CONFIG_RT2400PCI=m
+-CONFIG_RT2500PCI=m
+-CONFIG_RT2800PCI=m
++# CONFIG_RT2X00_LIB_PCI=m
++# CONFIG_RT2400PCI=m
++# CONFIG_RT2500PCI=m
++# CONFIG_RT2800PCI=m
+ NEED_RT2X00=y
+ 
+ # Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on
+ # CRC to check the firmware. We check here first for the PCI
+ # driver as we're in the PCI section.
+ ifneq ($(CONFIG_CRC_ITU_T),)
+-CONFIG_RT61PCI=m
++# CONFIG_RT61PCI=m

  NEED_RT2X00_FIRMWARE=y
  endif
  
  NEED_RT2X00_FIRMWARE=y
  endif
  


@@ -168,7 +191,7 @@
  
  endif
  ## end of PCI
  
  endif
  ## end of PCI

-@@ -285,18 +285,18 @@ endif
+@@ -285,22 +285,22 @@ endif

  ifneq ($(CONFIG_PCMCIA),)
  
  ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
  ifneq ($(CONFIG_PCMCIA),)
  
  ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)


@@ -192,7 +215,12 @@
  
  # USB Drivers
  ifneq ($(CONFIG_USB),)
  
  # USB Drivers
  ifneq ($(CONFIG_USB),)

-@@ -310,19 +310,19 @@ CONFIG_ZD1211RW=m
+-CONFIG_ZD1211RW=m
++# CONFIG_ZD1211RW=m
+ # CONFIG_ZD1211RW_DEBUG=y
+ 
+ # Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
+@@ -310,55 +310,55 @@ CONFIG_ZD1211RW=m

  # is only wireless RNDIS chip known to date.
  # 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
  # is only wireless RNDIS chip known to date.
  # 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


@@ -204,8 +232,10 @@
 +# CONFIG_USB_NET_CDCETHER=m
  
  
 +# CONFIG_USB_NET_CDCETHER=m
  
  

- CONFIG_P54_USB=m
- CONFIG_RTL8187=m
+-CONFIG_P54_USB=m
+-CONFIG_RTL8187=m
++# CONFIG_P54_USB=m
++# CONFIG_RTL8187=m

  
 -CONFIG_AT76C50X_USB=m
 +# CONFIG_AT76C50X_USB=m
  
 -CONFIG_AT76C50X_USB=m
 +# CONFIG_AT76C50X_USB=m


@@ -218,7 +248,18 @@
  endif
  
  # RT2500USB does not require firmware
  endif
  
  # RT2500USB does not require firmware

-@@ -337,28 +337,28 @@ NEED_RT2X00_FIRMWARE=y
+-CONFIG_RT2500USB=m
+-CONFIG_RT2800USB=m
+-CONFIG_RT2X00_LIB_USB=m
++# CONFIG_RT2500USB=m
++# CONFIG_RT2800USB=m
++# CONFIG_RT2X00_LIB_USB=m
+ NEED_RT2X00=y
+ # RT73USB requires firmware
+ ifneq ($(CONFIG_CRC_ITU_T),)
+-CONFIG_RT73USB=m
++# CONFIG_RT73USB=m
+ NEED_RT2X00_FIRMWARE=y

  endif
  
  ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
  endif
  
  ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)


@@ -282,7 +323,13 @@
  # CONFIG_IWM_DEBUG=y
  endif
  
  # CONFIG_IWM_DEBUG=y
  endif
  

-@@ -389,7 +389,7 @@ CONFIG_RT2X00_LIB=m
+@@ -384,12 +384,12 @@ endif # end of SDIO driver list
+ 
+ # Common rt2x00 requirements
+ ifeq ($(NEED_RT2X00),y)
+-CONFIG_RT2X00=m
++# CONFIG_RT2X00=m
+ CONFIG_RT2X00_LIB=m

  CONFIG_RT2X00_LIB_HT=y
  CONFIG_RT2X00_LIB_FIRMWARE=y
  CONFIG_RT2X00_LIB_CRYPTO=y
  CONFIG_RT2X00_LIB_HT=y
  CONFIG_RT2X00_LIB_FIRMWARE=y
  CONFIG_RT2X00_LIB_CRYPTO=y


@@ -291,9 +338,17 @@
  CONFIG_RT2X00_LIB_LEDS=y
  # CONFIG_RT2X00_LIB_DEBUGFS=y
  # CONFIG_RT2X00_DEBUG=y
  CONFIG_RT2X00_LIB_LEDS=y
  # CONFIG_RT2X00_LIB_DEBUGFS=y
  # CONFIG_RT2X00_DEBUG=y

-@@ -406,24 +406,24 @@ CONFIG_P54_LEDS=y
+@@ -400,30 +400,30 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
+ endif
+ 
+ # p54
+-CONFIG_P54_COMMON=m
++# CONFIG_P54_COMMON=m
+ CONFIG_P54_LEDS=y
+ 

  # Atheros
  # Atheros

- CONFIG_ATH_COMMON=m
+-CONFIG_ATH_COMMON=m
++# CONFIG_ATH_COMMON=m

  
 -CONFIG_WL12XX=y
 -CONFIG_WL1251=m
  
 -CONFIG_WL12XX=y
 -CONFIG_WL1251=m