X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fnetsupport.mk;h=60e3094c20a5c89a166adb39c0473ab970148795;hb=42e950ec7532b34f8a047f003c43840a0bb11256;hp=0d70a88a050057c7344acc746aacaf4d18930c6f;hpb=e1f0a91dfe76d24899452003f01dab5ee44f023d;p=openwrt%2Fstaging%2Flynxis.git diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 0d70a88a05..60e3094c20 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -148,7 +148,7 @@ $(eval $(call KernelPackage,8021q)) define KernelPackage/udptunnel4 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv4 UDP tunneling support - DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 + DEPENDS:=@!LINUX_3_14 KCONFIG:=CONFIG_NET_UDP_TUNNEL FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko AUTOLOAD:=$(call AutoLoad,32,udp_tunnel) @@ -160,7 +160,7 @@ $(eval $(call KernelPackage,udptunnel4)) define KernelPackage/udptunnel6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv6 UDP tunneling support - DEPENDS:=@!LINUX_3_10 @!LINUX_3_14 + DEPENDS:=@!LINUX_3_14 KCONFIG:=CONFIG_NET_UDP_TUNNEL FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel) @@ -174,8 +174,8 @@ define KernelPackage/vxlan TITLE:=Native VXLAN Kernel support DEPENDS:= \ +kmod-iptunnel \ - +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \ - +(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6 + +!LINUX_3_14:kmod-udptunnel4 \ + +(!LINUX_3_14&&IPV6):kmod-udptunnel6 KCONFIG:=CONFIG_VXLAN FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko AUTOLOAD:=$(call AutoLoad,13,vxlan) @@ -863,8 +863,8 @@ define KernelPackage/l2tp TITLE:=Layer Two Tunneling Protocol (L2TP) DEPENDS:= \ +IPV6:kmod-ipv6 \ - +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \ - +(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6 + +!LINUX_3_14:kmod-udptunnel4 \ + +(!LINUX_3_14&&IPV6):kmod-udptunnel6 KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ CONFIG_L2TP_DEBUGFS=n