X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fflorian.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fwireless.mk;h=413e353f5435e497e9759b70289fbc54c01978ba;hp=73ee125fc1cfecbda9caa0cc3317d4ae88f62f65;hb=c041f53b8d82a8521eec659b4618e6d268f44218;hpb=ce19a369af232ac48f9b27a2e20af87b1129cb6b;ds=sidebyside

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 73ee125fc1..413e353f54 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -8,47 +8,134 @@
 
 WIMENU:=Wireless Drivers
 
-define KernelPackage/bcm43xx
+define KernelPackage/ieee80211
+  TITLE:=802.11 Networking stack
+  DESCRIPTION:=\\\
+	\\\
+	Includes: \\\
+	- ieee80211_crypt \\\
+	- ieee80211 \\\
+	- ieee80211_crypt_wep \\\
+	- ieee80211_crypt_tkip \\\
+	- ieee80211_crytp_ccmp \\\
+	- ieee80211softmac
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC)
+  FILES:= \
+  	$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,10, \
+	ieee80211_crypt \
+	ieee80211 \
+	ieee80211_crypt_wep \
+	ieee80211_crypt_tkip \
+	ieee80211_crypt_ccmp \
+	ieee80211softmac \
+  )
+  SUBMENU:=$(WIMENU)
+endef
+$(eval $(call KernelPackage,ieee80211))
+
+
+define KernelPackage/net-bcm43xx
   TITLE:=Broadcom BCM43xx driver
   DESCRIPTION:=\\\
 	\\\
 	Includes: \\\
 	- bcm43xx
-  DEPENDS:=kmod-ieee80211softmac
+  DEPENDS:=kmod-ieee80211
   KCONFIG:=$(CONFIG_BCM43XX)
   FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call Autoload,50,bcm43xx)
   SUBMENU:=$(WIMENU)
 endef
-$(eval $(call KernelPackage,bcm43xx))
+$(eval $(call KernelPackage,net-bcm43xx))
 
-define KernelPackage/ipw2100
-  TITLE:=Intel IPw2100 driver
+define KernelPackage/net-ipw2100
+  TITLE:=Intel IPW2100 driver
   DESCRIPTION:=\\\
 	\\\
 	Includes: \\\
 	- ipw2100
-  DEPENDS:=kmod-ieee80211softmac
+  DEPENDS:=kmod-ieee80211
   KCONFIG:=$(CONFIG_IPW2100)
   FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call Autoload,50,ipw2100)
   SUBMENU:=$(WIMENU)
 endef
-$(eval $(call KernelPackage,ipw2100))
+$(eval $(call KernelPackage,net-ipw2100))
 
-define KernelPackage/ipw2200
-  TITLE:=Intel IPw2200 driver
+define KernelPackage/net-ipw2200
+  TITLE:=Intel IPW2200 driver
   DESCRIPTION:=\\\
 	\\\
 	Includes: \\\
 	- ipw2200
-  DEPENDS:=kmod-ieee80211softmac
+  DEPENDS:=kmod-ieee80211
   KCONFIG:=$(CONFIG_IPW2200)
   FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call Autoload,50,ipw2200)
   SUBMENU:=$(WIMENU)
 endef
-$(eval $(call KernelPackage,ipw2200))
+$(eval $(call KernelPackage,net-ipw2200))
+
+
+define KernelPackage/net-airo
+  TITLE:=Cisco Aironet driver
+  DESCRIPTION:=Driver for Cisco Aironet cards
+  KCONFIG:=$(CONFIG_AIRO)
+  SUBMENU:=$(WIMENU)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,airo)
+endef
+$(eval $(call KernelPackage,net-airo))
+
+
+define KernelPackage/net-hermes
+  TITLE:=Hermes 802.11b chipset support
+  DESCRIPTION:=Kernel support for Hermes 802.11b chipsets
+  KCONFIG:=$(CONFIG_HERMES)
+  SUBMENU:=$(WIMENU)
+  FILES:= \
+	$(MODULES_DIR)/kernel/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,hermes orinoco)
+endef
+$(eval $(call KernelPackage,net-hermes))
+
+
+define KernelPackage/net-hermes-pci
+  TITLE:=Intersil Prism 2.5 PCI support
+  DESCRIPTION:=Kernel modules for Intersil Prism 2.5 PCI support
+  KCONFIG:=$(CONFIG_PCI_HERMES)
+  DEPENDS:=kmod-net-hermes
+  SUBMENU:=$(WIMENU)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
+endef
+$(eval $(call KernelPackage,net-hermes-pci))
+
 
+define KernelPackage/net-hermes-plx
+  TITLE:=PLX9052 based PCI adaptor
+  DESCRIPTION:=Kernel modules for Hermes in PLX9052 based PCI adaptors
+  KCONFIG:=$(CONFIG_PLX_HERMES)
+  DEPENDS:=kmod-net-hermes
+  SUBMENU:=$(WIMENU)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
+endef
+$(eval $(call KernelPackage,net-hermes-plx))
+
+
+define KernelPackage/net-prism54
+  TITLE:=Intersil Prism54 support
+  DESCRIPTION:=Kernel modules for Intersil Prism54 support
+  KCONFIG:=$(CONFIG_PRISM54)
+  SUBMENU:=$(WIMENU)
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,prism54)
+endef
+$(eval $(call KernelPackage,net-prism54))