upgrade busybox to v1.11.1 and add current upstream fixes

[openwrt.git] / package / kernel / modules / wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 0310774..f83bb72 100644 (file)
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -1,27 +1,30 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # $Id$
 
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # $Id$
 

-WIMENU:=Wireless Drivers
+WIRELESS_MENU:=Wireless Drivers

 
 

+# NOTE: dependency on 2.6 was removed since it was inherited by kmod-hostap
+#       and prevented it from even showing up in menuconfig on 2.4

 define KernelPackage/ieee80211
 define KernelPackage/ieee80211

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=802.11 Networking stack
   TITLE:=802.11 Networking stack

-  DESCRIPTION:=\\\
-       \\\
-       Includes: \\\
-       - ieee80211_crypt \\\
-       - ieee80211 \\\
-       - ieee80211_crypt_wep \\\
-       - ieee80211_crypt_tkip \\\
-       - ieee80211_crytp_ccmp
-  DEPENDS:=@LINUX_2_6 +kmod-crypto
-  KCONFIG:=CONFIG_IEEE80211
+  DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic
+  KCONFIG:= \
+       CONFIG_IEEE80211 \
+       CONFIG_IEEE80211_CRYPT_WEP \
+       CONFIG_IEEE80211_CRYPT_CCMP \
+       CONFIG_IEEE80211_CRYPT_TKIP

   FILES:= \
   FILES:= \

-       $(LINUX_DIR)/net/ieee80211/*.$(LINUX_KMOD_SUFFIX)
+       $(LINUX_DIR)/net/ieee80211/ieee80211_crypt.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/ieee80211/ieee80211.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) \
+       $(LINUX_DIR)/net/ieee80211/ieee80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,10, \
        ieee80211_crypt \
        ieee80211 \
   AUTOLOAD:=$(call AutoLoad,10, \
        ieee80211_crypt \
        ieee80211 \


@@ -29,147 +32,169 @@ define KernelPackage/ieee80211
        ieee80211_crypt_tkip \
        ieee80211_crypt_ccmp \
   )
        ieee80211_crypt_tkip \
        ieee80211_crypt_ccmp \
   )

-  SUBMENU:=$(WIMENU)

 endef
 endef

+
+define KernelPackage/ieee80211/description
+ Kernel modules for 802.11 Networking stack
+ Includes:
+ - ieee80211_crypt
+ - ieee80211
+ - ieee80211_crypt_wep
+ - ieee80211_crypt_tkip
+ - ieee80211_crytp_ccmp
+endef
+

 $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
 $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=ieee80211 SoftMAC support
   TITLE:=ieee80211 SoftMAC support

-  DEPENDS:=kmod-ieee80211
+  DEPENDS:=+kmod-ieee80211

   KCONFIG:=CONFIG_IEEE80211_SOFTMAC
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC

-  FILES:= \
-       $(LINUX_DIR)/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/ieee80211/softmac/ieee80211softmac.$(LINUX_KMOD_SUFFIX)

   AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
   AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)

-  SUBMENU:=$(WIMENU)

 endef
 endef

+
+define KernelPackage/ieee80211-softmac/description
+ Kernel modules for 802.11 SoftMAC support
+endef
+

 $(eval $(call KernelPackage,ieee80211-softmac))
 
 $(eval $(call KernelPackage,ieee80211-softmac))
 

-define KernelPackage/mac80211
-  TITLE:=mac80211 (Devicescape) support
-  DEPENDS:=@LINUX_2_6
-  KCONFIG:=CONFIG_MAC80211
-  FILES:= \
-       $(LINUX_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
-       $(LINUX_DIR)/net/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
-  SUBMENU:=$(WIMENU)
- endef
-$(eval $(call KernelPackage,mac80211))

 
 define KernelPackage/net-bcm43xx
 
 define KernelPackage/net-bcm43xx

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Broadcom BCM43xx driver
   TITLE:=Broadcom BCM43xx driver

-  DESCRIPTION:=\\\
-       \\\
-       Includes: \\\
-       - bcm43xx
-  DEPENDS:=kmod-ieee80211-softmac
+  DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +kmod-ieee80211-softmac

   KCONFIG:=CONFIG_BCM43XX
   FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
   KCONFIG:=CONFIG_BCM43XX
   FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,bcm43xx)

-  SUBMENU:=$(WIMENU)

 endef
 endef

+
+define KernelPackage/net-bcm43xx/description
+ Kernel support for Broadcom BCM43xx
+ Includes:
+ - bcm43xx
+endef
+

 $(eval $(call KernelPackage,net-bcm43xx))
 
 $(eval $(call KernelPackage,net-bcm43xx))
 

+

 define KernelPackage/net-ipw2100
 define KernelPackage/net-ipw2100

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intel IPW2100 driver
   TITLE:=Intel IPW2100 driver

-  DESCRIPTION:=\\\
-       \\\
-       Includes: \\\
-       - ipw2100
-  DEPENDS:=kmod-ieee80211
+  DEPENDS:=@PCI_SUPPORT +kmod-ieee80211

   KCONFIG:=CONFIG_IPW2100
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2100)
   KCONFIG:=CONFIG_IPW2100
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2100)

-  SUBMENU:=$(WIMENU)

 endef
 endef

+
+define KernelPackage/net-ipw2100/description
+ Kernel support for Intel IPW2100
+ Includes:
+ - ipw2100
+endef
+

 $(eval $(call KernelPackage,net-ipw2100))
 
 $(eval $(call KernelPackage,net-ipw2100))
 

+

 define KernelPackage/net-ipw2200
 define KernelPackage/net-ipw2200

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intel IPW2200 driver
   TITLE:=Intel IPW2200 driver

-  DESCRIPTION:=\\\
-       \\\
-       Includes: \\\
-       - ipw2200
-  DEPENDS:=kmod-ieee80211
+  DEPENDS:=@PCI_SUPPORT +kmod-ieee80211

   KCONFIG:=CONFIG_IPW2200
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2200)
   KCONFIG:=CONFIG_IPW2200
   FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,ipw2200)

-  SUBMENU:=$(WIMENU)

 endef
 endef

+
+define KernelPackage/net-ipw2200/description
+ Kernel support for Intel IPW2200
+ Includes:
+ - ipw2200
+endef
+

 $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
 $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Cisco Aironet driver
   TITLE:=Cisco Aironet driver

-  DESCRIPTION:=Driver for Cisco Aironet cards
+  DEPENDS:=@PCI_SUPPORT

   KCONFIG:=CONFIG_AIRO
   KCONFIG:=CONFIG_AIRO

-  SUBMENU:=$(WIMENU)

   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,airo)
 endef

+
+define KernelPackage/net-airo/description
+ Kernel support for Cisco Aironet cards
+endef
+

 $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
 $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Hermes 802.11b chipset support
   TITLE:=Hermes 802.11b chipset support

-  DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT

   KCONFIG:=CONFIG_HERMES
   KCONFIG:=CONFIG_HERMES

-  SUBMENU:=$(WIMENU)

   FILES:= \
        $(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
 endef
   FILES:= \
        $(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
        $(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
 endef

+
+define KernelPackage/net-hermes/description
+ Kernel support for Hermes 802.11b chipsets
+endef
+

 $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
 $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intersil Prism 2.5 PCI support
   TITLE:=Intersil Prism 2.5 PCI support

-  DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@PCI_SUPPORT kmod-net-hermes

   KCONFIG:=CONFIG_PCI_HERMES
   KCONFIG:=CONFIG_PCI_HERMES

-  DEPENDS:=kmod-net-hermes
-  SUBMENU:=$(WIMENU)

   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef

+
+define KernelPackage/net-hermes-pci/description
+ Kernel modules for Intersil Prism 2.5 PCI support
+endef
+

 $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
 $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=PLX9052 based PCI adaptor
   TITLE:=PLX9052 based PCI adaptor

-  DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@PCI_SUPPORT kmod-net-hermes

   KCONFIG:=CONFIG_PLX_HERMES
   KCONFIG:=CONFIG_PLX_HERMES

-  DEPENDS:=kmod-net-hermes
-  SUBMENU:=$(WIMENU)

   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
   FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef

+
+define KernelPackage/net-hermes-plx/description
+ Kernel modules for Hermes in PLX9052 based PCI adaptors
+endef
+

 $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
 $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54

+  SUBMENU:=$(WIRELESS_MENU)

   TITLE:=Intersil Prism54 support
   TITLE:=Intersil Prism54 support

-  DESCRIPTION:=Kernel modules for Intersil Prism54 support
+  DEPENDS:=@PCI_SUPPORT

   KCONFIG:=CONFIG_PRISM54
   KCONFIG:=CONFIG_PRISM54

-  SUBMENU:=$(WIMENU)

   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,prism54)
 endef

-$(eval $(call KernelPackage,net-prism54))

 
 

-
-define KernelPackage/net-zd1211rw
-  TITLE:=Zydas ZD1211 support
-  DESCRIPTION:=Kernel modules Zydas ZD1211 support, kernel version
-  KCONFIG:=CONFIG_ZD1211RW
-  DEPENDS:=+kmod-ieee80211 +zd1211-firmware @LINUX_2_6
-  SUBMENU:=$(WIMENU)
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
+define KernelPackage/net-prism54/description
+ Kernel modules for Intersil Prism54 support

 endef
 endef

-$(eval $(call KernelPackage,net-zd1211rw))
+
+$(eval $(call KernelPackage,net-prism54))
+