X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e569cb2478bb80cbf7317f4a294e5b7ac675a387..7a19d5a01ba0518a45f672c057c818e04e64dd13:/package/kernel/modules/wireless.mk

diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 25e2286f1..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-core kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic @LINUX_2_4||@LINUX_2_6_21||LINUX_2_6_25
-  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||LINUX_2_6_32
   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,65 +39,12 @@ endef
 
 $(eval $(call KernelPackage,lib80211))
 
-
-define KernelPackage/net-libipw
-  SUBMENU:=$(WIRELESS_MENU)
-  TITLE:=libipw for ipw2100 and ipw2200
-  DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 @LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32
-  KCONFIG:=CONFIG_LIBIPW
-  FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2x00/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/ipw2x00/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/ipw2x00/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
 
@@ -151,11 +58,11 @@ $(eval $(call KernelPackage,net-airo))
 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
   FILES:= \
-	$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco.ko
   AUTOLOAD:=$(call AutoLoad,50,orinoco)
 endef
 
@@ -171,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/orinoco_pci.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko
   AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
 endef
 
@@ -187,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/orinoco_plx.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko
   AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
 endef
 
@@ -198,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