X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fnetwork.mk;h=675065cc0dd521a20dfa7e655d687fb8545a5cb4;hp=6479ee8047427008edbf80867579187cfd61ef52;hb=d6137beb1afa3a6e98496cdfa36f0534f2d3e377;hpb=667626d8a22d33c3b11f297aa2c8d28994c2af81

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 6479ee8047..675065cc0d 100644
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -49,7 +49,7 @@ $(eval $(call KernelPackage,bonding))
 define KernelPackage/ipip
   TITLE:=IP in IP encapsulation support
   DESCRIPTION:=\
-  	Kernel modules for IP in IP encapsulation
+	Kernel modules for IP in IP encapsulation
   KCONFIG:=$(CONFIG_NET_IPIP)
   SUBMENU:=$(NSMENU)
 endef
@@ -110,11 +110,12 @@ define KernelPackage/ipsec6
 	- ah6\\\
 	- esp6\\\
 	- ipcomp6\\\
-	- xfrm6_tunnel
+	- xfrm6_tunnel\\\
+	- tunnel6
   SUBMENU:=$(NSMENU)
   KCONFIG:=$(CONFIG_INET6_AH)
   DEPENDS:=kmod-ipsec
-  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \
+  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel tunnel6, \
 	$(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
   )
 endef
@@ -127,6 +128,7 @@ define KernelPackage/ipv6
 	Kernel modules for IPv6 support
   KCONFIG:=$(CONFIG_IPV6)
   SUBMENU:=$(NSMENU)
+  AUTOLOAD:=$(call AutoLoad,20,ipv6)
 endef
 define KernelPackage/ipv6/2.4
   FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX)
@@ -172,7 +174,7 @@ endef
 
 define KernelPackage/ppp/2.6
   FILES:= \
-  	$(LINUX_DIR)/drivers/net/ppp_async.ko \
+	$(LINUX_DIR)/drivers/net/ppp_async.ko \
 	$(LINUX_DIR)/drivers/net/ppp_generic.ko \
 	$(LINUX_DIR)/drivers/net/slhc.ko \
 	$(LINUX_DIR)/lib/crc-ccitt.ko
@@ -181,7 +183,7 @@ endef
 
 define KernelPackage/ppp/2.4
   FILES:= \
-  	$(LINUX_DIR)/drivers/net/ppp_async.o \
+	$(LINUX_DIR)/drivers/net/ppp_async.o \
 	$(LINUX_DIR)/drivers/net/ppp_generic.o \
 	$(LINUX_DIR)/drivers/net/slhc.o
   AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async)
@@ -196,7 +198,7 @@ define KernelPackage/pppoe
   DEPENDS:=kmod-ppp
   KCONFIG:=$(CONFIG_PPPOE)
   FILES:= \
-  	$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(NSMENU)
 endef
@@ -220,16 +222,19 @@ define KernelPackage/mppe
   TITLE:=Microsoft PPP compression/encryption
   DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption
   DEPENDS:=kmod-ppp
-  KCONFIG:=$(CONFIG_PPP_MPPE)
   SUBMENU:=$(NSMENU)
 endef
 
 define KernelPackage/mppe/2.4
+  KCONFIG:=$(CONFIG_PPP_MPPE_MPPC)
   FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe_mppc)
 endef
 
 define KernelPackage/mppe/2.6
+  KCONFIG:=$(CONFIG_PPP_MPPE)
   FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,31,ppp_mppe)
 endef
 $(eval $(call KernelPackage,mppe))
 
@@ -272,7 +277,7 @@ define KernelPackage/mp-alg
 	$(CONFIG_IP_ROUTE_MULTIPATH_RANDOM) \
 	$(CONFIG_IP_ROUTE_MULTIPATH_WRANDOM) \
 	$(CONFIG_IP_ROUTE_MULTIPATH_DRR)
-  FILES:=$(LINUX_DIR)/kernel/net/ipv4/multipath_*.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(LINUX_DIR)/net/ipv4/multipath_*.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
 endef
 $(eval $(call KernelPackage,mp-alg))
@@ -318,6 +323,18 @@ define KernelPackage/via-rhine
 endef
 $(eval $(call KernelPackage,via-rhine))
 
+define KernelPackage/via-velocity
+  TITLE:=VIA Velocity Gigabit Ethernet Adapter kernel support
+  DESCRIPTION:=\
+	Kernel modules for VIA Velocity Gigabit Ethernet chipsets.
+  FILES:=$(LINUX_DIR)/drivers/net/via-velocity.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=$(CONFIG_VIA_VELOCITY)
+  DEPENDS:=@LINUX_2_6_IXP4XX
+  SUBMENU:=$(NDMENU)
+  AUTOLOAD:=$(call AutoLoad,50,via-velocity)
+endef
+$(eval $(call KernelPackage,via-velocity))
+
 define KernelPackage/8139too
   TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support
   DESCRIPTION:=\