[package] fix kernel module name for autoloading

[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 66b5c47..e22b91f 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

-@@ -104,10 +104,10 @@ CONFIG_MAC80211_MESH=y
+@@ -107,10 +107,10 @@ CONFIG_MAC80211_MESH=y

  CONFIG_CFG80211=m
  # CONFIG_CFG80211_REG_DEBUG=y
  
  CONFIG_CFG80211=m
  # CONFIG_CFG80211_REG_DEBUG=y
  


@@ -14,8 +14,8 @@
 +# 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
+@@ -127,56 +127,56 @@ CONFIG_ATH9K=m

  # CONFIG_ATH9K_DEBUG=y
  
  
  # CONFIG_ATH9K_DEBUG=y
  
  


@@ -41,12 +41,14 @@
  
  
 -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=m
 -CONFIG_B43_PCI_AUTOSELECT=y
 -CONFIG_B43_PCICORE_AUTOSELECT=y
 -CONFIG_B43_PCMCIA=y
 -CONFIG_B43_PIO=y
 -CONFIG_B43_LEDS=y
 +# CONFIG_B43=m

++# CONFIG_B43_HWRNG=y

 +# CONFIG_B43_PCI_AUTOSELECT=y
 +# CONFIG_B43_PCICORE_AUTOSELECT=y
 +# CONFIG_B43_PCMCIA=y
 +# CONFIG_B43_PCI_AUTOSELECT=y
 +# CONFIG_B43_PCICORE_AUTOSELECT=y
 +# CONFIG_B43_PCMCIA=y


@@ -57,22 +59,24 @@
  # CONFIG_B43_FORCE_PIO=y
  
 -CONFIG_B43LEGACY=m
  # 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=m
 -CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 -CONFIG_B43LEGACY_LEDS=y
 +# CONFIG_B43LEGACY=m

++# CONFIG_B43LEGACY_HWRNG=y

 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 +# CONFIG_B43LEGACY_LEDS=y
  # CONFIG_B43LEGACY_RFKILL=y
  # CONFIG_B43LEGACY_DEBUG=y
 +# CONFIG_B43LEGACY_PCI_AUTOSELECT=y
 +# CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
 +# CONFIG_B43LEGACY_LEDS=y
  # CONFIG_B43LEGACY_RFKILL=y
  # CONFIG_B43LEGACY_DEBUG=y

--CONFIG_B43LEGACY_DMA=y
+ CONFIG_B43LEGACY_DMA=y

 -CONFIG_B43LEGACY_PIO=y
 -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 -CONFIG_B43LEGACY_PIO=y
 -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y

-+# CONFIG_B43LEGACY_DMA=y
+-# CONFIG_B43LEGACY_DMA_MODE=y

 +# CONFIG_B43LEGACY_PIO=y
 +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
 +# CONFIG_B43LEGACY_PIO=y
 +# CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y

- # CONFIG_B43LEGACY_DMA_MODE=y
++CONFIG_B43LEGACY_DMA_MODE=y

  # CONFIG_B43LEGACY_PIO_MODE=y
  
  # The Intel ipws
  # CONFIG_B43LEGACY_PIO_MODE=y
  
  # The Intel ipws


@@ -99,7 +103,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
+@@ -191,27 +191,27 @@ CONFIG_IPW2200_QOS=y

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


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

-@@ -226,16 +226,16 @@ CONFIG_RT61PCI=m
+@@ -227,16 +227,16 @@ CONFIG_RT61PCI=m

  NEED_RT2X00_FIRMWARE=y
  endif
  
  NEED_RT2X00_FIRMWARE=y
  endif
  


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

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


@@ -182,9 +186,17 @@
 -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)
+-CONFIG_AR9170_USB=m
+-CONFIG_AR9170_LEDS=y
++# CONFIG_AR9170_USB=m
++# CONFIG_AR9170_LEDS=y
+ endif
+ 

  # RT2500USB does not require firmware
  # RT2500USB does not require firmware

- CONFIG_RT2500USB=m
-@@ -294,20 +294,20 @@ CONFIG_P54_COMMON=m
+@@ -306,20 +306,20 @@ CONFIG_ATH_COMMON=m

  
  
  # Sonics Silicon Backplane
  
  
  # Sonics Silicon Backplane