diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-16 00:08:52 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-16 00:08:52 +0000 |
| commit | 4aebd87ddd14323dcf00b82ba90ddb6be4532fd1 (patch) | |
| tree | fd000e4f7fd3ad15cd4aa338de33c16d192aad86 /package/kernel | |
| parent | ea9bbe955d51ef63192a6b7affba3f6c5792a4cd (diff) | |
package/kernel: add missing modules autoloading for kmod-ipsec, kmod-ipsec4 & kmod-ipsec6 (partially closes: #7164)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20893 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 53e218d26..0c0c91244 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -193,6 +193,11 @@ endef $(eval $(call KernelPackage,ipip)) +IPSEC-m:= \ + key/af_key \ + xfrm/xfrm_ipcomp \ + xfrm/xfrm_user \ + define KernelPackage/ipsec SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4 and IPv6) @@ -201,22 +206,30 @@ define KernelPackage/ipsec CONFIG_NET_KEY \ 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 define KernelPackage/ipsec/description Kernel modules for IPsec support in both IPv4 and IPv6. Includes: - af_key + - xfrm_ipcomp - xfrm_user endef $(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 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4) @@ -229,9 +242,8 @@ define KernelPackage/ipsec4 CONFIG_INET_XFRM_MODE_TRANSPORT \ 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 define KernelPackage/ipsec4/description @@ -249,6 +261,15 @@ endef $(eval $(call KernelPackage,ipsec4)) +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) TITLE:=IPsec related modules (IPv6) @@ -261,9 +282,8 @@ define KernelPackage/ipsec6 CONFIG_INET6_XFRM_MODE_TRANSPORT \ 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 define KernelPackage/ipsec6/description @@ -289,9 +309,7 @@ define KernelPackage/iptunnel4 KCONFIG:= \ 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 @@ -308,9 +326,7 @@ define KernelPackage/iptunnel6 DEPENDS:= @LINUX_2_6 +kmod-ipv6 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 |