diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-25 22:47:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-07-25 22:47:48 +0200 |
| commit | 8de94346a4e6935c95658e113264358e6b927a88 (patch) | |
| tree | 513211b2f73bf49e1966b85c7bb33e65747f5b1d /target/linux/config | |
| parent | eff01a75ffd024cb8c0f30410aa304b7c12c1795 (diff) | |
| parent | 21a5f16953c38f8fa5ab08bdb05d840103d2c44c (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/linux/config')
| -rw-r--r-- | target/linux/config/Config.in.network | 7 |
1 files changed, 7 insertions, 0 deletions
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 |