aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-01-27 09:56:05 +0000
committerNicolas Thill <nico@openwrt.org>2009-01-27 09:56:05 +0000
commitbd2eee537c34dcfa1f70631c64494bc49ca28bf8 (patch)
tree31935dd6221187ca8987d58bf781ad4cc9d5db2e /package/kernel
parent3fa91d0a551fd690821a82b0d170e4af6d88506e (diff)
downloadmaster-187ad058-bd2eee537c34dcfa1f70631c64494bc49ca28bf8.tar.gz
master-187ad058-bd2eee537c34dcfa1f70631c64494bc49ca28bf8.tar.bz2
master-187ad058-bd2eee537c34dcfa1f70631c64494bc49ca28bf8.zip
revert [14081]: iptunnel4 does not make sense on 2.4, just add a conditionnal dependency on iptunnel4 to ipip
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14219 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/modules/netsupport.mk30
1 files changed, 14 insertions, 16 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index 3cc1ebbb5f..add8024796 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -118,7 +118,7 @@ $(eval $(call KernelPackage,misdn))
define KernelPackage/ipip
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IP-in-IP encapsulation
- DEPENDS:=+kmod-iptunnel4
+ DEPENDS:=+LINUX_2_6:kmod-iptunnel4
KCONFIG:=CONFIG_NET_IPIP
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,32,ipip)
@@ -216,22 +216,19 @@ endef
$(eval $(call KernelPackage,ipsec6))
-define KernelPackage/iptunnel4
- TITLE:=IP in IP encapsulation support
- KCONFIG:=$(CONFIG_NET_IPIP)
- SUBMENU:=$(NSMENU)
-endef
-define KernelPackage/iptunnel4/2.4
- FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,ipip)
-endef
-
-define KernelPackage/iptunnel4/2.6
- FILES:= \
- $(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
- AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
+# NOTE: tunnel4 is not selectable by itself, so enable ipip for that
+define KernelPackage/iptunnel4
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=IPv4 tunneling
+ DEPENDS:=@LINUX_2_6
+ KCONFIG:= \
+ CONFIG_NET_IPIP \
+ CONFIG_INET_TUNNEL
+ FILES:= $(foreach mod,tunnel4, \
+ $(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
+ )
+ AUTOLOAD:=$(call AutoLoad,31,tunnel4)
endef
define KernelPackage/iptunnel4/description
@@ -240,6 +237,7 @@ endef
$(eval $(call KernelPackage,iptunnel4))
+
define KernelPackage/iptunnel6
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPv6 tunneling