Hello,

Le 18 juil. 2013 05:45, "Nikolay Martynov" <[email protected]> a écrit :
>
> In 3.10 new ip_tunnel module has been created which is used by sit, ipip,
gre.
> Define ip_tunnel in Kernel Modules config menu and add appropriate
dependencies.

There is no dependency between kmod-ip_tunnel and Linux 3.10, will that
build for earlier kernels too where this module is not available?

>
> Fixes #13873
>
> Signed-off-by: Nikolay Martynov <[email protected]>
> ---
>  package/kernel/linux/modules/netsupport.mk | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git 
> a/package/kernel/linux/modules/netsupport.mkb/package/kernel/linux/modules/
netsupport.mk
> index 5b31093..2202cd5 100644
> --- a/package/kernel/linux/modules/netsupport.mk
> +++ b/package/kernel/linux/modules/netsupport.mk
> @@ -217,7 +217,7 @@ $(eval $(call KernelPackage,isdn4linux))
>  define KernelPackage/ipip
>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
>    TITLE:=IP-in-IP encapsulation
> -  DEPENDS:=+kmod-iptunnel4
> +  DEPENDS:=+kmod-iptunnel4 +kmod-ip_tunnel
>    KCONFIG:=CONFIG_NET_IPIP
>    FILES:=$(LINUX_DIR)/net/ipv4/ipip.ko
>    AUTOLOAD:=$(call AutoLoad,32,ipip)
> @@ -396,9 +396,24 @@ endef
>  $(eval $(call KernelPackage,ipv6))
>
>
> +define KernelPackage/ip_tunnel
> +  SUBMENU:=$(NETWORK_SUPPORT_MENU)
> +  TITLE:=IP tunnel support
> +  KCONFIG:=CONFIG_NET_IP_TUNNEL
> +  FILES:=$(LINUX_DIR)/net/ipv4/ip_tunnel.ko
> +  AUTOLOAD:=$(call AutoLoad,31,ip_tunnel)
> +endef
> +
> +define KernelPackage/ip_tunnel/description
> + Kernel modules for IP tunnelling
> +endef
> +
> +$(eval $(call KernelPackage,ip_tunnel))
> +
> +
>  define KernelPackage/sit
>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
> -  DEPENDS:=+kmod-ipv6 +kmod-iptunnel4
> +  DEPENDS:=+kmod-ipv6 +kmod-iptunnel4 +kmod-ip_tunnel
>    TITLE:=IPv6-in-IPv4 tunnel
>    KCONFIG:=CONFIG_IPV6_SIT \
>         CONFIG_IPV6_SIT_6RD=y
> @@ -432,7 +447,7 @@ $(eval $(call KernelPackage,ip6-tunnel))
>  define KernelPackage/gre
>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
>    TITLE:=GRE support
> -  DEPENDS:=+PACKAGE_kmod-ipv6:kmod-ipv6
> +  DEPENDS:=+PACKAGE_kmod-ipv6:kmod-ipv6 +kmod-ip_tunnel
>    KCONFIG:=CONFIG_NET_IPGRE CONFIG_NET_IPGRE_DEMUX
>    FILES:=$(LINUX_DIR)/net/ipv4/ip_gre.ko $(LINUX_DIR)/net/ipv4/gre.ko
>    AUTOLOAD:=$(call AutoLoad,39,gre ip_gre)
> @@ -448,7 +463,7 @@ $(eval $(call KernelPackage,gre))
>  define KernelPackage/gre6
>    SUBMENU:=$(NETWORK_SUPPORT_MENU)
>    TITLE:=GRE support over IPV6
> -  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6
> +  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel +kmod-ip_tunnel @!LINUX_3_3
@!LINUX_3_6
>    KCONFIG:=CONFIG_IPV6_GRE
>    FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
>    AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
> --
> 1.8.1.2
> _______________________________________________
> openwrt-devel mailing list
> [email protected]
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel

Reply via email to