X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f877fc28f803080de2e7c0682878186ba3ea7cfa..08c3d434a7d03a4e3ae146be2c27a3b49699fd3d:/package/kernel/modules/wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index c44a628c5..e8e9b8820 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -1,17 +1,19 @@
-# 
-# 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$
 
-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
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=802.11 Networking stack
-  DEPENDS:=@LINUX_2_6 +kmod-crypto
+  DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic
   KCONFIG:= \
 	CONFIG_IEEE80211 \
 	CONFIG_IEEE80211_CRYPT_WEP \
@@ -34,11 +36,11 @@ endef
 
 define KernelPackage/ieee80211/description
  Kernel modules for 802.11 Networking stack
- Includes:  
- - ieee80211_crypt  
- - ieee80211  
- - ieee80211_crypt_wep  
- - ieee80211_crypt_tkip  
+ Includes:
+ - ieee80211_crypt
+ - ieee80211
+ - ieee80211_crypt_wep
+ - ieee80211_crypt_tkip
  - ieee80211_crytp_ccmp
 endef
 
@@ -46,9 +48,9 @@ $(eval $(call KernelPackage,ieee80211))
 
 
 define KernelPackage/ieee80211-softmac
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=ieee80211 SoftMAC support
-  DEPENDS:=kmod-ieee80211
+  DEPENDS:=+kmod-ieee80211
   KCONFIG:=CONFIG_IEEE80211_SOFTMAC
   FILES:=$(LINUX_DIR)/net/ieee80211/softmac/ieee80211softmac.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac)
@@ -62,9 +64,9 @@ $(eval $(call KernelPackage,ieee80211-softmac))
 
 
 define KernelPackage/net-bcm43xx
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Broadcom BCM43xx driver
-  DEPENDS:=@PCI_SUPPORT +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)
@@ -72,7 +74,7 @@ endef
 
 define KernelPackage/net-bcm43xx/description
  Kernel support for Broadcom BCM43xx
- Includes:  
+ Includes:
  - bcm43xx
 endef
 
@@ -80,7 +82,7 @@ $(eval $(call KernelPackage,net-bcm43xx))
 
 
 define KernelPackage/net-ipw2100
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intel IPW2100 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2100
@@ -90,7 +92,7 @@ endef
 
 define KernelPackage/net-ipw2100/description
  Kernel support for Intel IPW2100
- Includes:  
+ Includes:
  - ipw2100
 endef
 
@@ -98,7 +100,7 @@ $(eval $(call KernelPackage,net-ipw2100))
 
 
 define KernelPackage/net-ipw2200
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intel IPW2200 driver
   DEPENDS:=@PCI_SUPPORT +kmod-ieee80211
   KCONFIG:=CONFIG_IPW2200
@@ -108,7 +110,7 @@ endef
 
 define KernelPackage/net-ipw2200/description
  Kernel support for Intel IPW2200
- Includes:  
+ Includes:
  - ipw2200
 endef
 
@@ -116,7 +118,7 @@ $(eval $(call KernelPackage,net-ipw2200))
 
 
 define KernelPackage/net-airo
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_AIRO
@@ -132,7 +134,7 @@ $(eval $(call KernelPackage,net-airo))
 
 
 define KernelPackage/net-hermes
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Hermes 802.11b chipset support
   DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT
   KCONFIG:=CONFIG_HERMES
@@ -150,7 +152,7 @@ $(eval $(call KernelPackage,net-hermes))
 
 
 define KernelPackage/net-hermes-pci
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism 2.5 PCI support
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PCI_HERMES
@@ -166,7 +168,7 @@ $(eval $(call KernelPackage,net-hermes-pci))
 
 
 define KernelPackage/net-hermes-plx
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=PLX9052 based PCI adaptor
   DEPENDS:=@PCI_SUPPORT kmod-net-hermes
   KCONFIG:=CONFIG_PLX_HERMES
@@ -182,7 +184,7 @@ $(eval $(call KernelPackage,net-hermes-plx))
 
 
 define KernelPackage/net-prism54
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
   DEPENDS:=@PCI_SUPPORT
   KCONFIG:=CONFIG_PRISM54
@@ -198,9 +200,9 @@ $(eval $(call KernelPackage,net-prism54))
 
 
 define KernelPackage/net-zd1211rw
-  SUBMENU:=$(WIMENU)
+  SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Zydas ZD1211 support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211 +zd1211-firmware
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211-softmac
   KCONFIG:=CONFIG_ZD1211RW
   FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,zd1211rw)