X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmac80211%2FMakefile;h=723ba77be5a6c5634501520cc67ae832707b10b7;hb=3930646affbdca1860cd5a73901452541ab143ce;hp=bbc8a6ca4890a672e88a63181dcf73acfa24ef12;hpb=f4e4cd840574b675d527cbee910f200134822bb4;p=openwrt.git

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index bbc8a6ca48..723ba77be5 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -13,30 +13,26 @@ 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 +wireless-tools
   FILES:= \
-	$(PKG_BUILD_DIR)/mac80211/mac80211.$(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)
+	$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
+	$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211)
 endef
 
 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)
+	$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) -DCONFIG_MAC80211_RCSIMPLE=1) \
+	$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS)
 
 MAKE_OPTS:= \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -44,37 +40,33 @@ MAKE_OPTS:= \
 	EXTRA_CFLAGS="$(BUILDFLAGS)" \
 	$(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
 	CONFIG_NL80211=y \
+	CONFIG_MAC80211_RCSIMPLE=y \
 	CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
-	LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \
+	LINUXINCLUDE="-I$(PKG_BUILD_DIR)/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/Prepare
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	$(Build/Patch)
+	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
+endef
 
-  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
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/net/wireless" modules
+	$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/net/mac80211" modules
+endef
 
+ifeq ($(CONFIG_LINUX_2_6_23),y)
   define Build/InstallDev
 	mkdir -p $(1)/usr/include/mac80211
-	$(CP) ./src/include/* $(1)/usr/include/mac80211/
-  endef
-
-  define Build/UninstallDev
-	rm -rf	$(1)/usr/include/mac80211
+	$(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
   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))