diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2013-03-25 10:49:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-26 12:27:18 -0400 |
| commit | fd58156e456d9f68fe04486be378d0bc93641532 (patch) | |
| tree | 50dd9ea7c5b048dad0f9b39e95f3c0299448d86c /net/ipv4/Kconfig | |
| parent | c54419321455631079c7d6e60bc732dd0c5914c5 (diff) | |
IPIP: Use ip-tunneling code.
Reuse common ip-tunneling code which is re-factored from GRE
module.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/Kconfig')
| -rw-r--r-- | net/ipv4/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 2073226a8a63..053b53e9e3c3 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig | |||
| @@ -166,6 +166,7 @@ config IP_PNP_RARP | |||
| 166 | config NET_IPIP | 166 | config NET_IPIP |
| 167 | tristate "IP: tunneling" | 167 | tristate "IP: tunneling" |
| 168 | select INET_TUNNEL | 168 | select INET_TUNNEL |
| 169 | select NET_IP_TUNNEL | ||
| 169 | ---help--- | 170 | ---help--- |
| 170 | Tunneling means encapsulating data of one protocol type within | 171 | Tunneling means encapsulating data of one protocol type within |
| 171 | another protocol and sending it over a channel that understands the | 172 | another protocol and sending it over a channel that understands the |