ipsec-tools update and fixes:

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 7514fb9..a4175ec 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -21,8 +21,8 @@ endif
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
-  TITLE:=DeviceScape 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6 +kmod-ieee80211
+  TITLE:=Linux 802.11 Wireless Networking Stack
+  DEPENDS:=@LINUX_2_6
   DESCRIPTION:=\
        This package contains the DeviceScape 80211 wireless stack.
   VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
@@ -32,7 +32,7 @@ define KernelPackage/mac80211
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
-   AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_lowest rc80211_simple)
+   AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
   endif
 endef
 
@@ -46,9 +46,9 @@ endef
 MAKE_OPTS:=-C "$(LINUX_DIR)" \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
-       EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS" \
+       EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS" \
        CONFIG_MAC80211=m \
-       CONFIG_MAC80211_LEDS=y
+       CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS)
 
 ifneq ($(KERNEL_PATCHVER),2.6.21)
   define Build/Compile
@@ -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))