X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=ec307b65062568d7a2385a3140e44a85b979ff2b;hb=0624bfd74fc95523c44c3372afd18b3e2d084bf7;hp=4c82c4cc04a7ac0dbe9b73d9c5386c3e14ffdce4;hpb=4c98f8465d7b207b150b3c67705e35297d7804be;p=openwrt-10.03%2F.git

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 4c82c4cc0..ec307b650 100644
--- 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))
 
@@ -34,6 +34,17 @@ define KernelPackage/atmtcp
 endef
 $(eval $(call KernelPackage,atmtcp))
 
+define KernelPackage/bonding
+  TITLE:=Ethernet bonding driver
+  DESCRIPTION:= \
+    Kernel module for NIC bonding.
+  DEPENDS:=@LINUX_2_6_X86
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_BONDING)
+  SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,40,bonding)
+endef
+$(eval $(call KernelPackage,bonding))
 
 define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
@@ -66,7 +77,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 +94,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 +112,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 +169,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 +177,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 +203,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))
@@ -245,7 +263,6 @@ define KernelPackage/natsemi
   FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=$(CONFIG_NATSEMI)
   DEPENDS:=@LINUX_2_6_X86
-  DEFAULT:=y
   SUBMENU:=$(NDMENU)
   AUTOLOAD:=$(call AutoLoad,20,natsemi)
 endef
@@ -257,8 +274,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))
 
@@ -268,8 +286,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))
 
@@ -279,22 +298,75 @@ 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/ne2k-pci
+  TITLE:=ne2k-pci Ethernet Adapter kernel support
+  DESCRIPTION:=\
+	ne2k-pci Ethernet Adapter kernel support.
+  FILES:=$(MODULES_DIR)/kernel/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \
+	$(MODULES_DIR)/kernel/drivers/net/8390.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_NE2K_PCI)
+  DEPENDS:=@LINUX_2_6_X86
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,8390 ne2k-pci)
+endef
+$(eval $(call KernelPackage,ne2k-pci))
+
+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)
+  AUTOLOAD:=$(call AutoLoad,50,e1000)
+endef
+$(eval $(call KernelPackage,e1000))
+
 define KernelPackage/3c59x
   TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang
   DESCRIPTION:=\
@@ -307,7 +379,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))