Allow mac80211 drivers to work in master mode

[openwrt.git] / package / mac80211 / patches / 001-disable_drivers.patch

diff --git a/package/mac80211/patches/001-disable_drivers.patch b/package/mac80211/patches/001-disable_drivers.patch
index 53bc0a9..c35cadc 100644 (file)
--- a/package/mac80211/patches/001-disable_drivers.patch
+++ b/package/mac80211/patches/001-disable_drivers.patch
@@ -1,12 +1,16 @@
-diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/config.mk
---- compat-wireless-2008-04-07/config.mk       2008-03-14 16:22:22.000000000 +0100
-+++ compat-wireless-2008-04-07.new/config.mk   2008-04-09 21:17:03.000000000 +0200
-@@ -28,66 +28,6 @@
+diff -urN compat-wireless-2008-05-26/config.mk compat-wireless-2008-05-26.new/config.mk
+--- compat-wireless-2008-05-26/config.mk       2008-05-20 09:37:02.000000000 +0200
++++ compat-wireless-2008-05-26.new/config.mk   2008-07-14 10:52:01.000000000 +0200
+@@ -28,73 +28,6 @@
  # PCI Drivers
  ifneq ($(CONFIG_PCI),)
  
 -CONFIG_ATH5K=m
 -CONFIG_ATH5K_DEBUG=n
+-
+-# Required for older kernels which still use this flag.
+-CONFIG_IWLWIFI=m
+-
 -CONFIG_IWLCORE=m
 -CONFIG_IWL3945=m
 -CONFIG_IWL4965=m
@@ -18,6 +22,8 @@ diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/co
 -CONFIG_B43_PCMCIA=y
 -CONFIG_B43_DMA=y
 -CONFIG_B43_PIO=y
+-# B43_PIO selects SSB_BLOCKIO
+-CONFIG_SSB_BLOCKIO=y
 -CONFIG_B43_DMA_AND_PIO_MODE=y
 -CONFIG_B43_PCI_AUTOSELECT=y
 -CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -61,6 +67,7 @@ diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/co
 -CONFIG_SSB_PCIHOST=y
 -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 -CONFIG_SSB_DRIVER_PCICORE=y
+-CONFIG_SSB_B43_PCI_BRIDGE=y
 -
 -CONFIG_RTL8180=m
 -CONFIG_ADM8211=m
@@ -68,19 +75,18 @@ diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/co
  CONFIG_RT2X00_LIB_PCI=m
  CONFIG_RT2400PCI=m
  CONFIG_RT2500PCI=m
-@@ -109,31 +49,6 @@
- 
- # USB Drivers
+@@ -118,32 +51,6 @@
  ifneq ($(CONFIG_USB),)
--CONFIG_ZD1211RW=m
--
+ CONFIG_ZD1211RW=m
+ 
 -# support for USB Wireless devices using Atmel at76c503,
 -# at76c505 or at76c505a chips.
 -CONFIG_USB_ATMEL=m
 -
 -# Stuff here things which depend on kernel versions for USB
 -ifeq ($(shell test -e $(KLIB_BUILD)/Makefile && echo yes),yes)
--ifeq ($(shell test $(shell sed 's/^SUBLEVEL = //;t;d' < $(KLIB_BUILD)/Makefile) -gt 21 && echo yes),yes)
+-KERNEL_SUBLEVEL = $(shell $(MAKE) -C $(KLIB_BUILD) kernelversion | sed -n 's/^2\.6\.\([0-9]\+\).*/\1/p')
+-ifeq ($(shell test $(KERNEL_SUBLEVEL) -gt 21 && echo yes),yes)
 -
 -# Sorry, rndis_wlan uses cancel_work_sync which is new and can't be done in compat...
 -
@@ -88,19 +94,21 @@ diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/co
 -# All of these devices are based on Broadcom 4320 chip which
 -# 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 a new RNDIS_HOST module which we add
+-# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
 -CONFIG_USB_NET_RNDIS_HOST=m
 -CONFIG_USB_NET_RNDIS_WLAN=m
+-CONFIG_USB_NET_CDCETHER=m
 -
 -endif
 -endif
 -
 -CONFIG_P54_USB=m
 -CONFIG_RTL8187=m
- 
+-
  # RT2500USB does not require firmware
  CONFIG_RT2500USB=m
-@@ -159,39 +74,6 @@
+ CONFIG_RT2X00_LIB_USB=m
+@@ -168,39 +75,6 @@
  CONFIG_RT2X00_LIB_FIRMWARE=y
  endif