From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 20 Jul 2008 11:43:56 +0000 (+0000)
Subject: update compat-wireless to a newer version, but leave it at the old version for brcm47... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=12d206d9eb10efc2fd1b25816ff7314fa4b24089;p=openwrt%2Fstaging%2Fmans0n.git

update compat-wireless to a newer version, but leave it at the old version for brcm47xx (b43 does not compile with the new one)

SVN-Revision: 11883
---

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 2280aa6065..92de02af97 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,9 +12,9 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
-PKG_VERSION:=2008-05-26
+PKG_VERSION:=$(if $(CONFIG_TARGET_brcm47xx),2008-05-26,2008-07-19)
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/05
+PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/07
 #PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
   FILES:= \
 	$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
@@ -168,8 +168,9 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include/mac80211
+	mkdir -p $(1)/usr/include/mac80211 $(1)/usr/include/net/mac80211
 	$(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
+	$(CP) $(PKG_BUILD_DIR)/net/mac80211/rate.h $(1)/usr/include/net/mac80211/
 endef
 
 define KernelPackage/mac80211/install