diff options
| author |   Tom Herbert <therbert@google.com> | 2014-11-04 09:06:51 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-05 16:30:02 -0500 |
| commit | 63487babf08d6d67483c67ed21d8cea6674a44ec (patch) | |
| tree | f0e11d54e33a689a25bed43f7bd3c720b49a6bcd /net/ipv4/Kconfig | |
| parent | Merge branch 'stmmac-next' (diff) | |
| download | linux-dev-63487babf08d6d67483c67ed21d8cea6674a44ec.tar.xz linux-dev-63487babf08d6d67483c67ed21d8cea6674a44ec.zip | |
net: Move fou_build_header into fou.c and refactor
Move fou_build_header out of ip_tunnel.c and into fou.c splitting
it up into fou_build_header, gue_build_header, and fou_build_udp.
This allows for other users for TX of FOU or GUE. Change ip_tunnel_encap
to call fou_build_header or gue_build_header based on the tunnel
encapsulation type. Similarly, added fou_encap_hlen and gue_encap_hlen
functions which are called by ip_encap_hlen. New net/fou.h has
prototypes and defines for this.
Added NET_FOU_IP_TUNNELS configuration. When this is set, IP tunnels
can use FOU/GUE and fou module is also selected.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index e682b48e0709..bd2901604842 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -322,6 +322,15 @@ config NET_FOU network mechanisms and optimizations for UDP (such as ECMP and RSS) can be leveraged to provide better service. +config NET_FOU_IP_TUNNELS + bool "IP: FOU encapsulation of IP tunnels" + depends on NET_IPIP || NET_IPGRE || IPV6_SIT + select NET_FOU + ---help--- + Allow configuration of FOU or GUE encapsulation for IP tunnels. + When this option is enabled IP tunnels can be configured to use + FOU or GUE encapsulation. + config GENEVE tristate "Generic Network Virtualization Encapsulation (Geneve)" depends on INET |