X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ca341a66db5ca390f55901056cb08c8e3435cba4..3ba9b8e05c0558a59742760e7c696c5927eb9fea:/package/kernel/modules/wireless.mk?ds=sidebyside diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index 609e04bf8..f0dd3b8e3 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -7,59 +7,19 @@ 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:=$(WIRELESS_MENU) - TITLE:=802.11 Networking stack - DEPENDS:=+kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic @LINUX_2_4||@LINUX_2_6_21||LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25||LINUX_2_6_26||LINUX_2_6_28 - KCONFIG:= \ - CONFIG_IEEE80211 \ - CONFIG_IEEE80211_CRYPT_WEP \ - CONFIG_IEEE80211_CRYPT_CCMP \ - CONFIG_IEEE80211_CRYPT_TKIP - FILES:= \ - $(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 \ - ieee80211_crypt_wep \ - ieee80211_crypt_tkip \ - ieee80211_crypt_ccmp \ - ) -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/lib80211 SUBMENU:=$(WIRELESS_MENU) TITLE:=802.11 Networking stack - DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 KCONFIG:= \ CONFIG_LIB80211 \ CONFIG_LIB80211_CRYPT_WEP \ CONFIG_LIB80211_CRYPT_TKIP \ CONFIG_LIB80211_CRYPT_CCMP FILES:= \ - $(LINUX_DIR)/net/wireless/lib80211.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/wireless/lib80211.ko \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_wep.ko \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_ccmp.ko \ + $(LINUX_DIR)/net/wireless/lib80211_crypt_tkip.ko AUTOLOAD:=$(call AutoLoad,10, \ lib80211 \ lib80211_crypt_wep \ @@ -79,69 +39,12 @@ endef $(eval $(call KernelPackage,lib80211)) - -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) - IPW_DIR:=ipw2x00/ -endif - -define KernelPackage/net-libipw - SUBMENU:=$(WIRELESS_MENU) - TITLE:=libipw for ipw2100 and ipw2200 - DEPENDS:=@PCI_SUPPORT +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31 - KCONFIG:=CONFIG_LIBIPW - FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)libipw.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,49,libipw) -endef - -define KernelPackage/net-libipw/description - Hardware independent IEEE 802.11 networking stack for ipw2100 and ipw2200. -endef - -$(eval $(call KernelPackage,net-libipw)) - - -define KernelPackage/net-ipw2100 - SUBMENU:=$(WIRELESS_MENU) - TITLE:=Intel IPW2100 driver - DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw - KCONFIG:=CONFIG_IPW2100 - FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)ipw2100.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,ipw2100) -endef - -define KernelPackage/net-ipw2100/description - Kernel support for Intel IPW2100 - Includes: - - ipw2100 -endef - -$(eval $(call KernelPackage,net-ipw2100)) - - -define KernelPackage/net-ipw2200 - SUBMENU:=$(WIRELESS_MENU) - TITLE:=Intel IPW2200 driver - DEPENDS:=@PCI_SUPPORT +!(LINUX_2_6_30||LINUX_2_6_31):kmod-ieee80211 +LINUX_2_6_30||LINUX_2_6_31:kmod-net-libipw - KCONFIG:=CONFIG_IPW2200 - FILES:=$(LINUX_DIR)/drivers/net/wireless/$(IPW_DIR)ipw2200.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,ipw2200) -endef - -define KernelPackage/net-ipw2200/description - Kernel support for Intel IPW2200 - Includes: - - ipw2200 -endef - -$(eval $(call KernelPackage,net-ipw2200)) - - define KernelPackage/net-airo SUBMENU:=$(WIRELESS_MENU) TITLE:=Cisco Aironet driver DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_AIRO - FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko AUTOLOAD:=$(call AutoLoad,50,airo) endef @@ -152,34 +55,15 @@ endef $(eval $(call KernelPackage,net-airo)) -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) - ORINOCO_DIR:=orinoco/ -endif - define KernelPackage/net-hermes SUBMENU:=$(WIRELESS_MENU) TITLE:=Hermes 802.11b chipset support - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT + DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT KCONFIG:=CONFIG_HERMES \ CONFIG_HERMES_CACHE_FW_ON_INIT=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.30)),1) FILES:= \ - $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.ko AUTOLOAD:=$(call AutoLoad,50,orinoco) -else -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.28)),1) - FILES:= \ - $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)hermes.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)hermes_dld.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,hermes hermes_dld orinoco) -else - 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) -endif -endif endef define KernelPackage/net-hermes/description @@ -194,7 +78,7 @@ define KernelPackage/net-hermes-pci TITLE:=Intersil Prism 2.5 PCI support DEPENDS:=@PCI_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PCI_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco_pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) endef @@ -210,7 +94,7 @@ define KernelPackage/net-hermes-plx TITLE:=PLX9052 based PCI adaptor DEPENDS:=@PCI_SUPPORT +kmod-net-hermes KCONFIG:=CONFIG_PLX_HERMES - FILES:=$(LINUX_DIR)/drivers/net/wireless/$(ORINOCO_DIR)orinoco_plx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) endef @@ -221,12 +105,28 @@ endef $(eval $(call KernelPackage,net-hermes-plx)) +define KernelPackage/net-hermes-pcmcia + SUBMENU:=$(WIRELESS_MENU) + TITLE:=Hermes based PCMCIA adaptors + DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes + KCONFIG:=CONFIG_PCMCIA_HERMES + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko + AUTOLOAD:=$(call AutoLoad,55,orinoco_cs) +endef + +define KernelPackage/net-hermes-pcmcia/description + Kernel modules for Hermes based PCMCIA adaptors +endef + +$(eval $(call KernelPackage,net-hermes-pcmcia)) + + define KernelPackage/net-prism54 SUBMENU:=$(WIRELESS_MENU) TITLE:=Intersil Prism54 support DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_PRISM54 - FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko AUTOLOAD:=$(call AutoLoad,60,prism54) endef