Add a boolean to allow NAT from LAN or not, default to nat LAN (#2535)

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index e6e858f..8a387b4 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -13,9 +13,6 @@ PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

-ifeq ($(DUMP),)
-  include $(LINUX_DIR)/.config
-endif

 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers


@@ -43,8 +40,9 @@ MAKE_OPTS:= \
        ARCH="$(LINUX_KARCH)" \
        EXTRA_CFLAGS="$(BUILDFLAGS)" \
        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
        ARCH="$(LINUX_KARCH)" \
        EXTRA_CFLAGS="$(BUILDFLAGS)" \
        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \

+       CONFIG_NL80211=y \

        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \

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

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


@@ -72,6 +70,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))