kernel: remove obsolete kernel version dependencies

[openwrt/svn-archive/archive.git] / package / kernel / linux / modules / netsupport.mk

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 376b588982964f3fe89e1e0ba9f4fa6cc9bd09bc..9de1ce2b4f07323077b00dffd5c44c17c248c603 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -144,9 +144,38 @@ endef
 
 $(eval $(call KernelPackage,8021q))
 
+
+define KernelPackage/udptunnel4
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPv4 UDP tunneling support
+  DEPENDS:=@!LINUX_3_10 @!LINUX_3_14
+  KCONFIG:=CONFIG_NET_UDP_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv4/udp_tunnel.ko
+  AUTOLOAD:=$(call AutoLoad,32,udp_tunnel)
+endef
+
+
+$(eval $(call KernelPackage,udptunnel4))
+
+define KernelPackage/udptunnel6
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IPv6 UDP tunneling support
+  DEPENDS:=@!LINUX_3_10 @!LINUX_3_14
+  KCONFIG:=CONFIG_NET_UDP_TUNNEL
+  FILES:=$(LINUX_DIR)/net/ipv6/ip6_udp_tunnel.ko
+  AUTOLOAD:=$(call AutoLoad,32,ip6_udp_tunnel)
+endef
+
+$(eval $(call KernelPackage,udptunnel6))
+
+
 define KernelPackage/vxlan
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   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
   KCONFIG:=CONFIG_VXLAN
   FILES:=$(LINUX_DIR)/drivers/net/vxlan.ko
   AUTOLOAD:=$(call AutoLoad,13,vxlan)
@@ -250,7 +279,7 @@ $(eval $(call KernelPackage,ipip))
 
 
 IPSEC-m:= \
-       $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \
+       xfrm/xfrm_algo \
        xfrm/xfrm_ipcomp \
        xfrm/xfrm_user \
        key/af_key \
@@ -376,6 +405,22 @@ endef
 $(eval $(call KernelPackage,iptunnel))
 
 
+define KernelPackage/ipvti
+  SUBMENU:=$(NETWORK_SUPPORT_MENU)
+  TITLE:=IP VTI (Virtual Tunnel Interface)
+  DEPENDS:=+kmod-iptunnel +kmod-iptunnel4 +kmod-ipsec4
+  KCONFIG:=CONFIG_NET_IPVTI
+  FILES:=$(LINUX_DIR)/net/ipv4/ip_vti.ko
+  AUTOLOAD:=$(call AutoLoad,33,ip_vti)
+endef
+
+define KernelPackage/ipvti/description
+ Kernel modules for IP VTI (Virtual Tunnel Interface)
+endef
+
+$(eval $(call KernelPackage,ipvti))
+
+
 define KernelPackage/iptunnel4
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=IPv4 tunneling
@@ -483,7 +528,7 @@ $(eval $(call KernelPackage,gre))
 define KernelPackage/gre6
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=GRE support over IPV6
-  DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6
+  DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel
   KCONFIG:=CONFIG_IPV6_GRE
   FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
   AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
@@ -781,6 +826,7 @@ define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
   KCONFIG:= \
+       CONFIG_HAMRADIO=y \
        CONFIG_AX25 \
        CONFIG_MKISS
   FILES:= \
@@ -842,7 +888,10 @@ $(eval $(call KernelPackage,pktgen))
 define KernelPackage/l2tp
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Layer Two Tunneling Protocol (L2TP)
-  DEPENDS:=+IPV6:kmod-ipv6
+  DEPENDS:= \
+       +IPV6:kmod-ipv6 \
+       +(!LINUX_3_10&&!LINUX_3_14):kmod-udptunnel4 \
+       +(!LINUX_3_10&&!LINUX_3_14&&IPV6):kmod-udptunnel6
   KCONFIG:=CONFIG_L2TP \
        CONFIG_L2TP_V3=y \
        CONFIG_L2TP_DEBUGFS=n