[adm5120] add kernel config option to disabling common PCI quirks, resync kernel...

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 63d7fff..bbc8a6c 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -21,53 +21,60 @@ define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
   DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes
-  KCONFIG:=CONFIG_MAC80211
   FILES:= \
        $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
-       $(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_simple)
 endef
 
 define KernelPackage/mac80211/description
- This package contains the DeviceScape 80211 wireless stack.
+Linux 802.11 Wireless Networking Stack
 endef
 
-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
+CONFOPTS:=MAC80211 CFG80211
 
-ifneq ($(CONFIG_MAC80211),)
+BUILDFLAGS:= \
+       $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) ) \
+       $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_NL80211)
 
-  MAKE_OPTS:= \
+MAKE_OPTS:= \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
-       EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS" \
-       CONFIG_MAC80211=m \
+       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" \
+
+ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),)
+  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
 
-  define Build/Compile/it
+  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
 
-endif
-
-define Build/Compile
-       $(call Build/Compile/it)
-endef
-
-define Build/InstallDev
+  define Build/InstallDev
        mkdir -p $(1)/usr/include/mac80211
-       $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(1)/usr/include/mac80211/
-endef
+       $(CP) ./src/include/* $(1)/usr/include/mac80211/
+  endef
 
-define Build/UninstallDev
+  define Build/UninstallDev
        rm -rf  $(1)/usr/include/mac80211
-endef
+  endef
+
+  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
 
 $(eval $(call KernelPackage,mac80211))