mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-13 10:24:51 +00:00
revert [14081]: iptunnel4 does not make sense on 2.4, just add a conditionnal dependency on iptunnel4 to ipip
SVN-Revision: 14219
This commit is contained in:
parent
92dd3af727
commit
088931d4de
@ -118,7 +118,7 @@ $(eval $(call KernelPackage,misdn))
|
|||||||
define KernelPackage/ipip
|
define KernelPackage/ipip
|
||||||
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||||
TITLE:=IP-in-IP encapsulation
|
TITLE:=IP-in-IP encapsulation
|
||||||
DEPENDS:=+kmod-iptunnel4
|
DEPENDS:=+LINUX_2_6:kmod-iptunnel4
|
||||||
KCONFIG:=CONFIG_NET_IPIP
|
KCONFIG:=CONFIG_NET_IPIP
|
||||||
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
|
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
|
||||||
AUTOLOAD:=$(call AutoLoad,32,ipip)
|
AUTOLOAD:=$(call AutoLoad,32,ipip)
|
||||||
@ -216,22 +216,19 @@ endef
|
|||||||
|
|
||||||
$(eval $(call KernelPackage,ipsec6))
|
$(eval $(call KernelPackage,ipsec6))
|
||||||
|
|
||||||
|
|
||||||
|
# NOTE: tunnel4 is not selectable by itself, so enable ipip for that
|
||||||
define KernelPackage/iptunnel4
|
define KernelPackage/iptunnel4
|
||||||
TITLE:=IP in IP encapsulation support
|
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||||
KCONFIG:=$(CONFIG_NET_IPIP)
|
TITLE:=IPv4 tunneling
|
||||||
SUBMENU:=$(NSMENU)
|
DEPENDS:=@LINUX_2_6
|
||||||
endef
|
KCONFIG:= \
|
||||||
|
CONFIG_NET_IPIP \
|
||||||
define KernelPackage/iptunnel4/2.4
|
CONFIG_INET_TUNNEL
|
||||||
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
|
FILES:= $(foreach mod,tunnel4, \
|
||||||
AUTOLOAD:=$(call AutoLoad,30,ipip)
|
$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
|
||||||
endef
|
)
|
||||||
|
AUTOLOAD:=$(call AutoLoad,31,tunnel4)
|
||||||
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
|
endef
|
||||||
|
|
||||||
define KernelPackage/iptunnel4/description
|
define KernelPackage/iptunnel4/description
|
||||||
@ -240,6 +237,7 @@ endef
|
|||||||
|
|
||||||
$(eval $(call KernelPackage,iptunnel4))
|
$(eval $(call KernelPackage,iptunnel4))
|
||||||
|
|
||||||
|
|
||||||
define KernelPackage/iptunnel6
|
define KernelPackage/iptunnel6
|
||||||
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||||
TITLE:=IPv6 tunneling
|
TITLE:=IPv6 tunneling
|
||||||
|
Loading…
Reference in New Issue
Block a user