diff options
| author | David S. Miller <davem@davemloft.net> | 2020-03-30 06:25:29 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-30 06:25:29 +0200 |
| commit | f0b5989745c3e0e92424d36869a97e4e8df7ab13 (patch) | |
| tree | 0e9759b9d6060bb94cad676b1b16e423d5ad2523 /net/ipv4/Kconfig | |
| parent | Merge branch 'DSA-mtu' (diff) | |
| parent | Linux 5.6 (diff) | |
| download | linux-f0b5989745c3e0e92424d36869a97e4e8df7ab13.tar.xz linux-f0b5989745c3e0e92424d36869a97e4e8df7ab13.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment conflict in mac80211.
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 f96bd489b362..6490b845e17b 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -303,6 +303,7 @@ config SYN_COOKIES config NET_IPVTI tristate "Virtual (secure) IP: tunneling" + depends on IPV6 || IPV6=n select INET_TUNNEL select NET_IP_TUNNEL select XFRM |