update wrt54g3g pattern version, add wrt54g3g-em pattern (#2663)

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index bbc8a6c..e288354 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -13,14 +13,11 @@ PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
-ifeq ($(DUMP),)
-  include $(LINUX_DIR)/.config
-endif
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes
+  DEPENDS:=@LINUX_2_6_23 +kmod-crypto-arc4 +kmod-crypto-aes
   FILES:= \
        $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
@@ -32,11 +29,11 @@ define KernelPackage/mac80211/description
 Linux 802.11 Wireless Networking Stack
 endef
 
-CONFOPTS:=MAC80211 CFG80211
+CONFOPTS:=MAC80211 CFG80211 NL80211
 
 BUILDFLAGS:= \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) ) \
-       $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_NL80211)
+       $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS)
 
 MAKE_OPTS:= \
        CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -47,34 +44,30 @@ MAKE_OPTS:= \
        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
        LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \
 
-ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
-  define Build/Prepare
+define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)/mac80211
        $(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/
        mkdir -p $(PKG_BUILD_DIR)/wireless
        $(CP) ./src/wireless/* $(PKG_BUILD_DIR)/wireless/
-  endef
+endef
 
-  define Build/Compile
+define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
        $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
-  endef
+endef
 
-  define Build/InstallDev
+define Build/InstallDev
        mkdir -p $(1)/usr/include/mac80211
        $(CP) ./src/include/* $(1)/usr/include/mac80211/
-  endef
+endef
 
-  define Build/UninstallDev
+define Build/UninstallDev
        rm -rf  $(1)/usr/include/mac80211
-  endef
+endef
 
-  define KernelPackage/mac80211/install
+define KernelPackage/mac80211/install
        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
-  endef
-else
-  override CONFIG_PACKAGE_kmod-mac80211=
-endif
+endef
 
 $(eval $(call KernelPackage,mac80211))