From a2b45c4a8375070c1eaa2d4c30e89d2d56a29b1a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sat, 11 Apr 2015 10:43:46 +0000 Subject: kernel: remove kernel module checks/dependencies for 3.14 Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45377 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/linux/modules/netsupport.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'package/kernel/linux/modules/netsupport.mk') diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 60e3094c20..547e429f09 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -148,7 +148,6 @@ $(eval $(call KernelPackage,8021q)) define KernelPackage/udptunnel4 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv4 UDP tunneling support - 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 +159,6 @@ $(eval $(call KernelPackage,udptunnel4)) define KernelPackage/udptunnel6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv6 UDP tunneling support - 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 +172,8 @@ define KernelPackage/vxlan TITLE:=Native VXLAN Kernel support DEPENDS:= \ +kmod-iptunnel \ - +!LINUX_3_14:kmod-udptunnel4 \ - +(!LINUX_3_14&&IPV6):kmod-udptunnel6 + +kmod-udptunnel4 \ + +IPV6:kmod-udptunnel6 KCONFIG:=CONFIG_VXLAN FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko AUTOLOAD:=$(call AutoLoad,13,vxlan) @@ -863,8 +861,8 @@ define KernelPackage/l2tp TITLE:=Layer Two Tunneling Protocol (L2TP) DEPENDS:= \ +IPV6:kmod-ipv6 \ - +!LINUX_3_14:kmod-udptunnel4 \ - +(!LINUX_3_14&&IPV6):kmod-udptunnel6 + +kmod-udptunnel4 \ + +IPV6:kmod-udptunnel6 KCONFIG:=CONFIG_L2TP \ CONFIG_L2TP_V3=y \ CONFIG_L2TP_DEBUGFS=n -- cgit v1.2.3