From aee4a6b08953fa5175173d98d086a05f9d26f90e Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 7 Aug 2007 09:14:45 +0000
Subject: [PATCH] Fix the mac80211 installation, remove the in-kernel mac80211
 package, thanks to Daniel Gimpelevich

SVN-Revision: 8369
---
 package/kernel/modules/wireless.mk | 13 -------------
 package/mac80211/Makefile          |  9 +++++++++
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 031077467f..ff5f08a1b0 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -45,19 +45,6 @@ define KernelPackage/ieee80211-softmac
 endef
 $(eval $(call KernelPackage,ieee80211-softmac))
 
-define KernelPackage/mac80211
-  TITLE:=mac80211 (Devicescape) support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=CONFIG_MAC80211
-  FILES:= \
-  	$(LINUX_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/net/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
-  SUBMENU:=$(WIMENU)
- endef
-$(eval $(call KernelPackage,mac80211))
-
 define KernelPackage/net-bcm43xx
   TITLE:=Broadcom BCM43xx driver
   DESCRIPTION:=\\\
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index c59aaa508b..a4175ec012 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -57,4 +57,13 @@ ifneq ($(KERNEL_PATCHVER),2.6.21)
   endef
 endif
 
+define Build/InstallDev
+	mkdir -p $(STAGING_DIR)/usr/include/mac80211
+	$(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(STAGING_DIR)/usr/include/mac80211
+endef
+
+define Build/UninstallDev
+	rm -rf	$(STAGING_DIR)/usr/include/mac80211
+endef
+
 $(eval $(call KernelPackage,mac80211))
-- 
2.30.2