Update mac80211 to compat-wireless-2008-05-26

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11357 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 21 insertions, 10 deletions

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index bbcba63fce..eb09864144 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,9 +12,10 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
-PKG_VERSION:=2008-04-07
+PKG_VERSION:=2008-05-26
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
+PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/05
+#PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/mac80211/patches/001-disable_drivers.patch b/package/mac80211/patches/001-disable_drivers.patch
index 53bc0a9649..3c88b0e25c 100644
--- a/package/mac80211/patches/001-disable_drivers.patch
+++ b/package/mac80211/patches/001-disable_drivers.patch
@@ -1,12 +1,17 @@
-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 @@
+Index: compat-wireless-2008-05-26/config.mk
+===================================================================
+--- compat-wireless-2008-05-26.orig/config.mk	2008-05-27 19:15:19.000000000 +0100
++++ compat-wireless-2008-05-26/config.mk	2008-05-27 19:52:31.000000000 +0100
+@@ -28,73 +28,6 @@ CONFIG_NL80211=y
  # 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 +23,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 +68,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,7 +76,7 @@ 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 @@
+@@ -116,33 +49,6 @@ CONFIG_EEPROM_93CX6=m
  
  # USB Drivers
  ifneq ($(CONFIG_USB),)
@@ -80,7 +88,8 @@ diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/co
 -
 -# 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,9 +97,10 @@ 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
@@ -100,7 +110,7 @@ diff -urN compat-wireless-2008-04-07/config.mk compat-wireless-2008-04-07.new/co
  
  # RT2500USB does not require firmware
  CONFIG_RT2500USB=m
-@@ -159,39 +74,6 @@
+@@ -168,39 +74,6 @@ ifeq ($(NEED_RT2X00_FIRMWARE),y)
  CONFIG_RT2X00_LIB_FIRMWARE=y
  endif