kernel: remove useless AddDepends/input abstraction

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

diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index 8671df1318c25b85f6b82e84b4dbd7c23dc2f006..0d70a88a050057c7344acc746aacaf4d18930c6f 100644 (file)
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -144,10 +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
+  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)
@@ -251,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 \
@@ -377,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
@@ -484,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,14 +825,15 @@ $(eval $(call KernelPackage,sched))
 define KernelPackage/ax25
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=AX25 support
+  DEPENDS:=+kmod-lib-crc16
   KCONFIG:= \
+       CONFIG_HAMRADIO=y \
        CONFIG_AX25 \
        CONFIG_MKISS
   FILES:= \
        $(LINUX_DIR)/net/ax25/ax25.ko \
        $(LINUX_DIR)/drivers/net/hamradio/mkiss.ko
   AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss)
-  $(call AddDepends/crc16)
 endef
 
 define KernelPackage/ax25/description
@@ -798,33 +843,6 @@ endef
 $(eval $(call KernelPackage,ax25))
 
 
-define KernelPackage/mp-alg
-  SUBMENU:=$(NETWORK_SUPPORT_MENU)
-  TITLE:=ECMP caching algorithms
-  KCONFIG:= \
-       CONFIG_IP_ROUTE_MULTIPATH_RR \
-       CONFIG_IP_ROUTE_MULTIPATH_RANDOM \
-       CONFIG_IP_ROUTE_MULTIPATH_WRANDOM \
-       CONFIG_IP_ROUTE_MULTIPATH_DRR
-  FILES:= \
-       $(LINUX_DIR)/net/ipv4/multipath_rr.ko \
-       $(LINUX_DIR)/net/ipv4/multipath_random.ko \
-       $(LINUX_DIR)/net/ipv4/multipath_wrandom.ko \
-       $(LINUX_DIR)/net/ipv4/multipath_drr.ko
-  AUTOLOAD:=$(call AutoLoad,35,multipath_rr multipath_random multipath_wrandom multipath_drr)
-endef
-
-define KernelPackage/mp-alg/description
- Kernel modules that provide several different algorithms for multipath
- route selection from the route cache. The iproute "mpath" argument allows
- specifying which algorithm to use for routes.
- quagga (at least <=0.99.6) requires a multipath patch to support this
- cached mp route feature.
-endef
-
-$(eval $(call KernelPackage,mp-alg))
-
-
 define KernelPackage/pktgen
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   DEPENDS:=@!TARGET_uml
@@ -843,7 +861,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