bump ath9k package version number, too

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index eb09864..92de02a 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,9 +12,9 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
-PKG_VERSION:=2008-05-26
+PKG_VERSION:=$(if $(CONFIG_TARGET_brcm47xx),2008-05-26,2008-07-19)
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/05
+PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/07
 #PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
   FILES:= \
        $(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
@@ -122,35 +122,13 @@ define KernelPackage/rt73-usb
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 
-RT2X00_CONFOPTS:=CONFIG_RT2X00=y \
-               CONFIG_RT2X00_DEBUG=y \
-               CONFIG_RT2X00_LIB_FIRMWARE=y \
-               CONFIG_RT2X00_LIB_LEDS=y
-
-ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT2X00_LIB_USB=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2400PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT2500PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT2500USB=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),)
-  RT2X00_CONFOPTS+= CONFIG_RT61PCI=y
-endif
-ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),)
-  RT2X00_CONFOPTS+= CONFIG_RT73USB=y
-endif
-
-
-CONFOPTS:=MAC80211 CFG80211 NL80211 MAC80211_RC_DEFAULT_PID MAC80211_RC_PID \
+define KernelPackage/net-zd1211rw
+  SUBMENU:=Wireless Drivers
+  TITLE:=Zydas ZD1211 support
+  DEPENDS:=@LINUX_2_6_24||LINUX_2_6_25 @USB_SUPPORT +kmod-ieee80211-softmac
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+endef
 
 BUILDFLAGS:= \
        $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt)) \
@@ -176,6 +154,7 @@ define Build/Prepare
        $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
        unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW)
        unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW)
+       rm -rf $(PKG_BUILD_DIR)/include/linux/ssb
 endef
 
 ifneq ($(CONFIG_PACKAGE_kmod-mac80211),)
@@ -189,8 +168,9 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/include/mac80211
+       mkdir -p $(1)/usr/include/mac80211 $(1)/usr/include/net/mac80211
        $(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
+       $(CP) $(PKG_BUILD_DIR)/net/mac80211/rate.h $(1)/usr/include/net/mac80211/
 endef
 
 define KernelPackage/mac80211/install
@@ -208,7 +188,7 @@ define KernelPackage/rt73-usb/install
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
 endef
 
-
+$(eval $(call KernelPackage,net-zd1211rw))
 $(eval $(call KernelPackage,mac80211))
 $(eval $(call KernelPackage,rt2x00-lib))
 $(eval $(call KernelPackage,rt2x00-pci))