[mac80211] update openfw to 5.2

[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 dc93a7f..fca00f7 100644 (file)
--- a/package/mac80211/patches/007-remove_unused_stuff.patch
+++ b/package/mac80211/patches/007-remove_unused_stuff.patch
@@ -1,7 +1,7 @@
 --- a/config.mk
 +++ b/config.mk
 --- a/config.mk
 +++ b/config.mk

-@@ -104,10 +104,10 @@ CONFIG_MAC80211_MESH=y
- CONFIG_CFG80211=m
+@@ -153,10 +153,10 @@ CONFIG_CFG80211_DEFAULT_PS=y
+ CONFIG_CFG80211_DEFAULT_PS_VALUE=1

  # CONFIG_CFG80211_REG_DEBUG=y
  
 -CONFIG_LIB80211=m
  # CONFIG_CFG80211_REG_DEBUG=y
  
 -CONFIG_LIB80211=m


@@ -14,57 +14,70 @@
 +# CONFIG_LIB80211_CRYPT_TKIP=m
  # CONFIG_LIB80211_DEBUG=y
  
 +# CONFIG_LIB80211_CRYPT_TKIP=m
  # CONFIG_LIB80211_DEBUG=y
  

- CONFIG_NL80211=y
-@@ -128,54 +128,54 @@ CONFIG_ATH9K=m
+ CONFIG_WIRELESS_OLD_REGULATORY=n
+@@ -169,61 +169,61 @@ ifneq ($(CONFIG_PCI),)
+ 
+ CONFIG_ATH5K=m
+ # CONFIG_ATH5K_DEBUG=y
+-CONFIG_ATH5K_RFKILL=y
++# CONFIG_ATH5K_RFKILL=y
+ CONFIG_ATH9K=m

  # CONFIG_ATH9K_DEBUG=y
  
  
 -CONFIG_IWLWIFI=m
 -CONFIG_IWLWIFI_LEDS=y
  # CONFIG_ATH9K_DEBUG=y
  
  
 -CONFIG_IWLWIFI=m
 -CONFIG_IWLWIFI_LEDS=y

+-CONFIG_IWLWIFI_RFKILL=y
+-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y

 +# CONFIG_IWLWIFI=m
 +# CONFIG_IWLWIFI_LEDS=y
 +# CONFIG_IWLWIFI=m
 +# CONFIG_IWLWIFI_LEDS=y

- # CONFIG_IWLWIFI_RFKILL=y
--CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
++# CONFIG_IWLWIFI_RFKILL=y

 +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
  # CONFIG_IWLWIFI_DEBUG=y
  # CONFIG_IWLWIFI_DEBUGFS=y
 -CONFIG_IWLAGN=m
 +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
  # CONFIG_IWLWIFI_DEBUG=y
  # CONFIG_IWLWIFI_DEBUGFS=y
 -CONFIG_IWLAGN=m

--CONFIG_IWL4965=y
+-CONFIG_COMPAT_IWL4965=y

 -CONFIG_IWL5000=y
 -CONFIG_IWL3945=m
 -CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 +# CONFIG_IWLAGN=m
 -CONFIG_IWL5000=y
 -CONFIG_IWL3945=m
 -CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
 +# CONFIG_IWLAGN=m

-+# CONFIG_IWL4965=y
++# CONFIG_COMPAT_IWL4965=y

 +# CONFIG_IWL5000=y
 +# CONFIG_IWL3945=m
 +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
  
  
 -CONFIG_B43=m
 +# CONFIG_IWL5000=y
 +# CONFIG_IWL3945=m
 +# CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
  
  
 -CONFIG_B43=m

+-CONFIG_B43_HWRNG=y

 -CONFIG_B43_PCI_AUTOSELECT=y
 -CONFIG_B43_PCICORE_AUTOSELECT=y
 -CONFIG_B43_PCMCIA=y
 -CONFIG_B43_PIO=y
 -CONFIG_B43_LEDS=y
 -CONFIG_B43_PCI_AUTOSELECT=y
 -CONFIG_B43_PCICORE_AUTOSELECT=y
 -CONFIG_B43_PCMCIA=y
 -CONFIG_B43_PIO=y
 -CONFIG_B43_LEDS=y

+-CONFIG_B43_RFKILL=y

 +# CONFIG_B43=m
 +# CONFIG_B43=m

++# CONFIG_B43_HWRNG=y

 +# CONFIG_B43_PCI_AUTOSELECT=y
 +# CONFIG_B43_PCICORE_AUTOSELECT=y
 +# CONFIG_B43_PCMCIA=y
 +# CONFIG_B43_PIO=y
 +# CONFIG_B43_LEDS=y
 +# CONFIG_B43_PCI_AUTOSELECT=y
 +# CONFIG_B43_PCICORE_AUTOSELECT=y
 +# CONFIG_B43_PCMCIA=y
 +# CONFIG_B43_PIO=y
 +# CONFIG_B43_LEDS=y

- # CONFIG_B43_RFKILL=y
++# CONFIG_B43_RFKILL=y

  # CONFIG_B43_DEBUG=y
  # CONFIG_B43_FORCE_PIO=y
  
 -CONFIG_B43LEGACY=m
  # CONFIG_B43_DEBUG=y
  # CONFIG_B43_FORCE_PIO=y
  
 -CONFIG_B43LEGACY=m

+-CONFIG_B43LEGACY_HWRNG=y

 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 -CONFIG_B43LEGACY_LEDS=y
 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 -CONFIG_B43LEGACY_LEDS=y

+-CONFIG_B43LEGACY_RFKILL=y

 +# CONFIG_B43LEGACY=m
 +# CONFIG_B43LEGACY=m

++# CONFIG_B43LEGACY_HWRNG=y

 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 +# CONFIG_B43LEGACY_LEDS=y
 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 +# CONFIG_B43LEGACY_LEDS=y

- # CONFIG_B43LEGACY_RFKILL=y
++# CONFIG_B43LEGACY_RFKILL=y

  # CONFIG_B43LEGACY_DEBUG=y
  CONFIG_B43LEGACY_DMA=y
 -CONFIG_B43LEGACY_PIO=y
  # CONFIG_B43LEGACY_DEBUG=y
  CONFIG_B43LEGACY_DMA=y
 -CONFIG_B43LEGACY_PIO=y


@@ -99,7 +112,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:

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

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


@@ -132,8 +145,7 @@
 +# 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


@@ -142,7 +154,7 @@
  
  CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
  
  CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m

-@@ -226,16 +226,16 @@ CONFIG_RT61PCI=m
+@@ -274,10 +274,10 @@ CONFIG_RT61PCI=m

  NEED_RT2X00_FIRMWARE=y
  endif
  
  NEED_RT2X00_FIRMWARE=y
  endif
  


@@ -156,6 +168,23 @@
  
  endif
  ## end of PCI
  
  endif
  ## end of PCI

+@@ -285,18 +285,18 @@ endif
+ ifneq ($(CONFIG_PCMCIA),)
+ 
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
+-CONFIG_LIBERTAS=n
+-CONFIG_LIBERTAS_CS=n
++# CONFIG_LIBERTAS=n
++# CONFIG_LIBERTAS_CS=n
+ else
+-CONFIG_LIBERTAS_CS=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_CS=m
++# NEED_LIBERTAS=y
+ endif
+ 
+ endif
+ ## end of PCMCIA

  
  # This is required for some cards
 -CONFIG_EEPROM_93CX6=m
  
  # This is required for some cards
 -CONFIG_EEPROM_93CX6=m


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

-@@ -249,21 +249,21 @@ CONFIG_ZD1211RW=m
+@@ -310,19 +310,19 @@ 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


@@ -176,15 +205,12 @@
  
  
  CONFIG_P54_USB=m
  
  
  CONFIG_P54_USB=m

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

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

- # Activate AR9170 support only on kernel >= 2.6.29.
- # The needed USB poison feature was added in this kernel release.
- ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 28 && echo yes),yes)

 -CONFIG_AR9170_USB=m
 -CONFIG_AR9170_LEDS=y
 +# CONFIG_AR9170_USB=m
 -CONFIG_AR9170_USB=m
 -CONFIG_AR9170_LEDS=y
 +# CONFIG_AR9170_USB=m


@@ -192,8 +218,93 @@
  endif
  
  # RT2500USB does not require firmware
  endif
  
  # RT2500USB does not require firmware

-@@ -301,20 +301,20 @@ CONFIG_P54_COMMON=m
+@@ -337,28 +337,28 @@ NEED_RT2X00_FIRMWARE=y
+ endif
+ 
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
+-CONFIG_LIBERTAS_THINFIRM_USB=n
+-CONFIG_LIBERTAS_USB=n
+-NEED_LIBERTAS=n
++# CONFIG_LIBERTAS_THINFIRM_USB=n
++# CONFIG_LIBERTAS_USB=n
++# NEED_LIBERTAS=n
+ else
+-CONFIG_LIBERTAS_THINFIRM_USB=m
+-CONFIG_LIBERTAS_USB=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_THINFIRM_USB=m
++# CONFIG_LIBERTAS_USB=m
++# NEED_LIBERTAS=y
+ endif
+ 
+ endif # end of USB driver list
+ 
+ ifneq ($(CONFIG_SPI_MASTER),)

  
  

+-CONFIG_WL1251=m
+-CONFIG_P54_SPI=m
++# CONFIG_WL1251=m
++# CONFIG_P54_SPI=m
+ 
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
+-CONFIG_LIBERTAS_SPI=n
+-NEED_LIBERTAS=n
++# CONFIG_LIBERTAS_SPI=n
++# NEED_LIBERTAS=n
+ else
+-CONFIG_LIBERTAS_SPI=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_SPI=m
++# NEED_LIBERTAS=y
+ endif
+ 
+ endif # end of SPI driver list
+@@ -366,17 +366,17 @@ endif # end of SPI driver list
+ ifneq ($(CONFIG_MMC),)
+ 
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
+-CONFIG_LIBERTAS_SDIO=n
+-NEED_LIBERTAS=n
++# CONFIG_LIBERTAS_SDIO=n
++# NEED_LIBERTAS=n
+ else
+-CONFIG_LIBERTAS_SDIO=m
+-NEED_LIBERTAS=y
++# CONFIG_LIBERTAS_SDIO=m
++# NEED_LIBERTAS=y
+ endif
+ 
+ # Activate iwmc3200wifi support only on kernel >= 2.6.29.
+ # iwmc3200wifi uses new netdev_ops api no supported by old kernel.
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 29 && echo yes),yes)
+-CONFIG_IWM=m
++# CONFIG_IWM=m
+ # CONFIG_IWM_DEBUG=y
+ endif
+ 
+@@ -389,7 +389,7 @@ CONFIG_RT2X00_LIB=m
+ CONFIG_RT2X00_LIB_HT=y
+ CONFIG_RT2X00_LIB_FIRMWARE=y
+ CONFIG_RT2X00_LIB_CRYPTO=y
+-CONFIG_RT2X00_LIB_RFKILL=y
++# CONFIG_RT2X00_LIB_RFKILL=y
+ CONFIG_RT2X00_LIB_LEDS=y
+ # CONFIG_RT2X00_LIB_DEBUGFS=y
+ # CONFIG_RT2X00_DEBUG=y
+@@ -406,24 +406,24 @@ CONFIG_P54_LEDS=y
+ # Atheros
+ CONFIG_ATH_COMMON=m
+ 
+-CONFIG_WL12XX=y
+-CONFIG_WL1251=m
+-CONFIG_WL1251_SPI=m
+-CONFIG_WL1251_SDIO=m
+-CONFIG_WL1271=m
++# CONFIG_WL12XX=y
++# CONFIG_WL1251=m
++# CONFIG_WL1251_SPI=m
++# CONFIG_WL1251_SDIO=m
++# CONFIG_WL1271=m

  
  # Sonics Silicon Backplane
 -CONFIG_SSB_POSSIBLE=y
  
  # Sonics Silicon Backplane
 -CONFIG_SSB_POSSIBLE=y


@@ -204,19 +315,27 @@
 +# CONFIG_SSB_SPROM=y
  # CONFIG_SSB_DEBUG=y
  
 +# CONFIG_SSB_SPROM=y
  # CONFIG_SSB_DEBUG=y
  

- ifneq ($(CONFIG_USB),)
- ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m)
--CONFIG_LIBERTAS_USB=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_USB=m
-+# NEED_LIBERTAS=y
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 26 && echo yes),yes)
+-CONFIG_LIBERTAS=n
++# CONFIG_LIBERTAS=n
+ else
+ ifeq ($(NEED_LIBERTAS),y)
+-CONFIG_LIBERTAS_THINFIRM=m
+-CONFIG_LIBERTAS=m
++# CONFIG_LIBERTAS_THINFIRM=m
++# CONFIG_LIBERTAS=m
+ # CONFIG_LIBERTAS_DEBUG=y

  endif
  endif
  endif
  endif

- ifneq ($(CONFIG_PCMCIA),)
--CONFIG_LIBERTAS_CS=m
--NEED_LIBERTAS=y
-+# CONFIG_LIBERTAS_CS=m
-+# NEED_LIBERTAS=y
+@@ -431,8 +431,8 @@ endif
+ # We need the backported rfkill module on kernel < 2.6.31.
+ # In more recent kernel versions use the in kernel rfkill module.
+ ifeq ($(shell test $(KERNEL_SUBLEVEL) -le 30 && echo yes),yes)
+-CONFIG_RFKILL_BACKPORT=m
+-CONFIG_RFKILL_BACKPORT_LEDS=y
+-CONFIG_RFKILL_BACKPORT_INPUT=y
++# CONFIG_RFKILL_BACKPORT=m
++# CONFIG_RFKILL_BACKPORT_LEDS=y
++# CONFIG_RFKILL_BACKPORT_INPUT=y

  endif
  endif

- ifeq ($(NEED_LIBERTAS),y)
- CONFIG_LIBERTAS=m
+