diff options
| author | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-23 19:17:05 +0000 |
|---|---|---|
| committer | acinonyx <acinonyx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-23 19:17:05 +0000 |
| commit | cbd58665284effd90f05948921d06e4a32f65ad0 (patch) | |
| tree | 6f4bf91873d5cf1cac52c3348d0fd05c6c32def1 /package/kernel | |
| parent | 7922ab6eda2140e43d8d34a2324cc08631cf64d1 (diff) | |
Revert "[package] kernel/modules: dont only change loading order on IPSEC*-m, propagate this to documentation too"
Preserve alphabetical order on KCONFIG and description for consistency with other module packages
This reverts commit r32775.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32791 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 5d78027ef..b4e2a425a 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -275,11 +275,11 @@ define KernelPackage/ipsec4 KCONFIG:= \ CONFIG_INET_AH \ CONFIG_INET_ESP \ + CONFIG_INET_IPCOMP \ CONFIG_INET_XFRM_MODE_BEET \ CONFIG_INET_XFRM_MODE_TRANSPORT \ CONFIG_INET_XFRM_MODE_TUNNEL \ - CONFIG_INET_XFRM_TUNNEL \ - CONFIG_INET_IPCOMP + CONFIG_INET_XFRM_TUNNEL FILES:=$(foreach mod,$(IPSEC4-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC4-m))) endef @@ -289,11 +289,11 @@ define KernelPackage/ipsec4/description Includes: - ah4 - esp4 + - ipcomp4 - xfrm4_mode_beet - xfrm4_mode_transport - xfrm4_mode_tunnel - xfrm4_tunnel - - ipcomp endef $(eval $(call KernelPackage,ipsec4)) @@ -315,11 +315,11 @@ define KernelPackage/ipsec6 KCONFIG:= \ CONFIG_INET6_AH \ CONFIG_INET6_ESP \ + CONFIG_INET6_IPCOMP \ CONFIG_INET6_XFRM_MODE_BEET \ CONFIG_INET6_XFRM_MODE_TRANSPORT \ CONFIG_INET6_XFRM_MODE_TUNNEL \ - CONFIG_INET6_XFRM_TUNNEL \ - CONFIG_INET6_IPCOMP + CONFIG_INET6_XFRM_TUNNEL FILES:=$(foreach mod,$(IPSEC6-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,32,$(notdir $(IPSEC6-m))) endef @@ -329,11 +329,11 @@ define KernelPackage/ipsec6/description Includes: - ah6 - esp6 + - ipcomp6 - xfrm6_mode_beet - xfrm6_mode_transport - xfrm6_mode_tunnel - xfrm6_tunnel - - ipcomp6 endef $(eval $(call KernelPackage,ipsec6)) |