Changeset 20893

Timestamp:

2010-04-16T02:08:52+02:00 (8 years ago)

Author:

nico

Message:

package/kernel: add missing modules autoloading for kmod-ipsec, kmod-ipsec4 & kmod-ipsec6 (partially closes: #7164)

File:

• trunk/package/kernel/modules/netsupport.mk (modified) (9 diffs)

trunk/package/kernel/modules/netsupport.mk

@@ -194 +194 @@
 
 
+IPSEC-m:= \
+        key/af_key \
+        xfrm/xfrm_ipcomp \
+        xfrm/xfrm_user \
+
 define KernelPackage/ipsec
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -202 +207 @@
         CONFIG_XFRM_USER \
         CONFIG_XFRM_IPCOMP
-  FILES:= \
-        $(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
-        $(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) \
-        $(LINUX_DIR)/net/xfrm/xfrm_ipcomp.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(foreach mod,$(IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,30,$(notdir $(IPSEC-m)))
 endef
 
@@ -212 +215 @@
  Includes:
  - af_key
+ - xfrm_ipcomp
  - xfrm_user
 endef
@@ -217 +221 @@
 $(eval $(call KernelPackage,ipsec))
 
+
+IPSEC4-m:= \
+        ipv4/ah4 \
+        ipv4/esp4 \
+        ipv4/xfrm4_mode_beet \
+        ipv4/xfrm4_mode_transport \
+        ipv4/xfrm4_mode_tunnel \
+        ipv4/xfrm4_tunnel \
+        ipv4/ipcomp \
 
 define KernelPackage/ipsec4
@@ -230 +243 @@
         CONFIG_INET_XFRM_MODE_TUNNEL \
         CONFIG_INET_XFRM_TUNNEL
-  FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_mode_beet xfrm4_mode_transport xfrm4_mode_tunnel xfrm4_tunnel , \
-        $(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m)))
 endef
 
@@ -250 +262 @@
 
 
+IPSEC6-m:= \
+        ipv6/ah6 \
+        ipv6/esp6 \
+        ipv6/xfrm6_mode_beet \
+        ipv6/xfrm6_mode_transport \
+        ipv6/xfrm6_mode_tunnel \
+        ipv6/xfrm6_tunnel \
+        ipv6/ipcomp6 \
+
 define KernelPackage/ipsec6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -262 +283 @@
         CONFIG_INET6_XFRM_MODE_TUNNEL \
         CONFIG_INET6_XFRM_TUNNEL
-  FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_mode_beet xfrm6_mode_transport xfrm6_mode_tunnel xfrm6_tunnel, \
-        $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m)))
 endef
 
@@ -290 +310 @@
         CONFIG_NET_IPIP \
         CONFIG_INET_TUNNEL
-  FILES:= $(foreach mod,tunnel4, \
-        $(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,tunnel4)
 endef
@@ -309 +327 @@
   KCONFIG:= \
         CONFIG_INET6_TUNNEL
-  FILES:= $(foreach mod,tunnel6, \
-        $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \
-  )
+  FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,31,tunnel6)
 endef