rename the <boardname>-<kernelversion> directories of base-files to just <boardname...

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 16a8d69..d75a65b 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -18,7 +18,7 @@ define KernelPackage/atm
     $(MODULES_DIR)/kernel/net/atm/br2684.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_ATM)
   SUBMENU:=$(NSMENU)
-  AUTOLOAD:=$(call AutoLoad,30,atm)
+  AUTOLOAD:=$(call AutoLoad,30,atm br2684)
 endef
 $(eval $(call KernelPackage,atm))
 
@@ -66,7 +66,8 @@ define KernelPackage/ipsec
        - xfrm_user
   SUBMENU:=$(NSMENU)
   DEPENDS:=@LINUX_2_6
-  FILES:=\
+  KCONFIG:=$(CONFIG_NET_KEY)
+  FILES:= \
        $(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
        $(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX)
 endef
@@ -82,9 +83,11 @@ define KernelPackage/ipsec4
        - ipcomp\\\
        - xfrm4_tunnel
   SUBMENU:=$(NSMENU)
+  KCONFIG:=$(CONFIG_INET_AH)
   DEPENDS:=kmod-ipsec
-  FILES:=\
-       $(MODULES_DIR)/kernel/net/ipv4/{ah4,esp4,ipcomp,xfrm4_tunnel}.$(LINUX_KMOD_SUFFIX)
+  FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \
+       $(MODULES_DIR)/kernel/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
+  )
 endef
 $(eval $(call KernelPackage,ipsec4))
 
@@ -98,9 +101,11 @@ define KernelPackage/ipsec6
        - ipcomp6\\\
        - xfrm6_tunnel
   SUBMENU:=$(NSMENU)
+  KCONFIG:=$(CONFIG_INET6_AH)
   DEPENDS:=kmod-ipsec
-  FILES:=\
-       $(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX)
+  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \
+       $(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) \
+  )
 endef
 $(eval $(call KernelPackage,ipsec6))
 
@@ -153,7 +158,7 @@ define KernelPackage/ppp/2.6
        $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \
        $(MODULES_DIR)/kernel/drivers/net/slhc.ko \
        $(MODULES_DIR)/kernel/lib/crc-ccitt.ko
-  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt)
+  AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async)
 endef
 
 define KernelPackage/ppp/2.4
@@ -161,6 +166,7 @@ define KernelPackage/ppp/2.4
        $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \
        $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \
        $(MODULES_DIR)/kernel/drivers/net/slhc.o
+  AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
 endef
 $(eval $(call KernelPackage,ppp))
 
@@ -186,6 +192,7 @@ define KernelPackage/pppoa
   DEPENDS:=kmod-ppp
   KCONFIG:=$(CONFIG_PPPOATM)
   FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pppoatm)
   SUBMENU:=$(NSMENU)
 endef
 $(eval $(call KernelPackage,pppoa))
@@ -219,33 +226,19 @@ endef
 $(eval $(call KernelPackage,sched))
 
 
-define KernelPackage/ieee80211softmac
-  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 \
-  )
+
+define KernelPackage/ax25
+  TITLE:=AX25 support
+  DESCRIPTION:=Kernel modules for AX25 support
   SUBMENU:=$(NSMENU)
+  KCONFIG:=$(CONFIG_AX25)
+  FILES:= \
+       $(MODULES_DIR)/kernel/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
 endef
-$(eval $(call KernelPackage,ieee80211softmac))
+$(eval $(call KernelPackage,ax25))
+
 
 
 
@@ -271,8 +264,9 @@ define KernelPackage/sis900
        Kernel modules for Sis 900 Ethernet adapters.
   FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_SIS900)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,sis900)
 endef
 $(eval $(call KernelPackage,sis900))
 
@@ -282,8 +276,9 @@ define KernelPackage/via-rhine
        Kernel modules for Via Rhine Ethernet chipsets.
   FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_VIA_RHINE)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,via-rhine)
 endef
 $(eval $(call KernelPackage,via-rhine))
 
@@ -293,22 +288,61 @@ define KernelPackage/8139too
        Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters.
   FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_8139TOO)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,8139too)
 endef
 $(eval $(call KernelPackage,8139too))
 
+define KernelPackage/r8169
+  TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
+  DESCRIPTION:=\
+       Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/r8169.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_R8169)
+  DEPENDS:=@LINUX_2_6_X86 
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,r8169)
+endef
+$(eval $(call KernelPackage,r8169))
+
+define KernelPackage/ixp4xx-npe
+  TITLE:=Intel(R) IXP4xx ethernet support
+  DESCRIPTION:=\
+       Kernel modules for Intel(R) IXP4xx onboard ethernet.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_qmgr.$(LINUX_KMOD_SUFFIX) \
+       $(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_mac.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_IXP4XX_MAC)
+  DEPENDS:=@LINUX_2_6_IXP4XX
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,20,ixp4xx_npe ixp4xx_qmgr ixp4xx_mac)
+endef
+$(eval $(call KernelPackage,ixp4xx-npe))
+
 define KernelPackage/e100
   TITLE:=Intel(R) PRO/100+ cards kernel support
   DESCRIPTION:=\
        Kernel modules for Intel(R) PRO/100+ Ethernet adapters.
   FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_E100)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,e100)
 endef
 $(eval $(call KernelPackage,e100))
 
+define KernelPackage/e1000
+  TITLE:=Intel(R) PRO/1000 cards kernel support
+  DESCRIPTION:=\
+       Kernel modules for Intel(R) PRO/1000 Ethernet adapters.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_E1000)
+  DEPENDS:=@LINUX_2_6_X86
+  SUBMENU:=$(NDMENU)
+endef
+$(eval $(call KernelPackage,e1000))
+
 define KernelPackage/3c59x
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DESCRIPTION:=\
@@ -321,7 +355,8 @@ define KernelPackage/3c59x
        - "Hurricane" (3c555/3cSOHO)                           PCI 
   FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_3C59X)
-  DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86
+  DEPENDS:=@LINUX_2_6_X86
   SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,3c59x)
 endef
 $(eval $(call KernelPackage,3c59x))