diff options
| author | Travis Kemen <thepeople@openwrt.org> | 2009-01-18 00:18:06 +0000 |
|---|---|---|
| committer | Travis Kemen <thepeople@openwrt.org> | 2009-01-18 00:18:06 +0000 |
| commit | e24da6d2bff20e8a9d7c69dae090183856294c2b (patch) | |
| tree | 61c0f9e07d4c318ab4e9a427a81958178dd5d518 | |
| parent | 34d7a5027305cdc579fcf46dc7e41c5b3bc29eb5 (diff) | |
| download | upstream-e24da6d2bff20e8a9d7c69dae090183856294c2b.tar.gz upstream-e24da6d2bff20e8a9d7c69dae090183856294c2b.tar.bz2 upstream-e24da6d2bff20e8a9d7c69dae090183856294c2b.zip | |
fix compile of iptunnel4 for the 2.4 kernel
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14081 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/kernel/modules/netsupport.mk | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 70e239c412..d207003f8b 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -216,19 +216,22 @@ endef $(eval $(call KernelPackage,ipsec6)) - -# 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) + 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) endef define KernelPackage/iptunnel4/description @@ -237,7 +240,6 @@ endef $(eval $(call KernelPackage,iptunnel4)) - define KernelPackage/iptunnel6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv6 tunneling |