summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2015-07-25 14:01:29 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-07-25 16:22:00 +0200
commita3ef1029548a88a62bab481cd0ab0ef01bcacb6c (patch)
tree6a7f9c8d3f80096f42b6324496fee91987287c2a
parent43a9d19dcc4fb72a8ef885de2e2b801b1e053a0b (diff)
mk/modules.mk: add missing ip_tunnel.ko
Signed-off-by: Phil Sutter <phil@nwl.cc>
-rw-r--r--mk/modules.mk4
-rw-r--r--target/linux/config/Config.in.network7
2 files changed, 11 insertions, 0 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 2fa35b29a..35e0a3053 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -214,6 +214,10 @@ $(eval $(call KMOD_template,INET_TUNNEL,inet-tunnel,\
$(MODULES_DIR)/kernel/net/ipv4/tunnel4 \
,20))
+$(eval $(call KMOD_template,NET_IP_TUNNEL,net-ip-tunnel,\
+ $(MODULES_DIR)/kernel/net/ipv4/ip_tunnel \
+,30))
+
$(eval $(call KMOD_template,NET_IPIP,net-ipip,\
$(MODULES_DIR)/kernel/net/ipv4/ipip \
,60))
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index 0915e776e..9fb3007aa 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -26,6 +26,7 @@ config ADK_KERNEL_IPV6
config ADK_KERNEL_IPV6_SIT
tristate "IPv6-in-IPv4 tunnel (SIT driver)"
select ADK_KERNEL_INET_TUNNEL
+ select ADK_KERNEL_NET_IP_TUNNEL
help
Tunneling means encapsulating data of one protocol type within
another protocol and sending it over a channel that understands the
@@ -124,9 +125,14 @@ config ADK_KERNEL_VLAN_8021Q
config ADK_KERNEL_INET_TUNNEL
tristate
+config ADK_KERNEL_NET_IP_TUNNEL
+ tristate
+ default n
+
config ADK_KERNEL_NET_IPIP
tristate "IP in IP encapsulation support"
select ADK_KERNEL_INET_TUNNEL
+ select ADK_KERNEL_NET_IP_TUNNEL
help
Tunneling means encapsulating data of one protocol type within
another protocol and sending it over a channel that understands the
@@ -141,6 +147,7 @@ config ADK_KERNEL_NET_IPGRE
tristate "GRE tunnels over IP"
select ADK_KERNEL_NET_IPGRE_BROADCAST
select ADK_KERNEL_NET_IPGRE_DEMUX
+ select ADK_KERNEL_NET_IP_TUNNEL
help
Tunneling means encapsulating data of one protocol type within
another protocol and sending it over a channel that understands the