fix nl80211

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 1898998..bbc8a6c 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -32,21 +32,20 @@ define KernelPackage/mac80211/description
 Linux 802.11 Wireless Networking Stack
 endef
 
 Linux 802.11 Wireless Networking Stack
 endef
 

-CONFOPTS:=MAC80211 CFG80211 NL80211
+CONFOPTS:=MAC80211 CFG80211

 
 BUILDFLAGS:= \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) ) \
 
 BUILDFLAGS:= \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) ) \

-       $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS)
+       $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_NL80211)

 
 MAKE_OPTS:= \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
        EXTRA_CFLAGS="$(BUILDFLAGS)" \
        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
 
 MAKE_OPTS:= \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
        EXTRA_CFLAGS="$(BUILDFLAGS)" \
        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \

+       CONFIG_NL80211=y \

        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
        LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \
        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
        LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \

-       V=1
-

 
 ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
   define Build/Prepare
 
 ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
   define Build/Prepare


@@ -63,7 +62,7 @@ ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
 
   define Build/InstallDev
        mkdir -p $(1)/usr/include/mac80211
 
   define Build/InstallDev
        mkdir -p $(1)/usr/include/mac80211

-       $(CP) ./src/include $(1)/usr/include/mac80211/
+       $(CP) ./src/include/* $(1)/usr/include/mac80211/

   endef
 
   define Build/UninstallDev
   endef
 
   define Build/UninstallDev


@@ -74,6 +73,8 @@ ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
   endef
        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
   endef

+else
+  override CONFIG_PACKAGE_kmod-mac80211=

 endif
 
 $(eval $(call KernelPackage,mac80211))
 endif
 
 $(eval $(call KernelPackage,mac80211))