hotplug2: add fork handling optimization (also fixes that pesky pppoe race condition...

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

diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk
index 6479ee8..e618672 100644 (file)
--- a/package/kernel/modules/network.mk
+++ b/package/kernel/modules/network.mk
@@ -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)
@@ -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))