Fix the mac80211 installation, remove the in-kernel mac80211 package, thanks to Danie...

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

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 031077467f922ddc1ba6edece42fd0404549931c..ff5f08a1b0043f764985e9b18bdf6c69ca574e48 100644 (file)
--- 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 c59aaa508b840ced29f71bd117b1b14c475a338c..a4175ec012424749ff2e3fa89bcfc3fb589897ec 100644 (file)
--- 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))