diff options
| author | Anisse Astier <anisse@astier.eu> | 2012-02-07 08:39:11 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-07 19:35:28 +0100 |
| commit | 6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd (patch) | |
| tree | a474640348866b4b7f7ba14bb52978f5963191c0 /net/ipv4 | |
| parent | bnx2x: Fix mem leak in bnx2x_tpa_stop() if build_skb() fails. (diff) | |
| download | linux-6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd.tar.xz linux-6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd.zip | |
net: Fix build regression when INET_UDP_DIAG=y and IPV6=m
Tested-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index aa2a2c79776f..d183262943d9 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -409,7 +409,7 @@ config INET_TCP_DIAG config INET_UDP_DIAG tristate "UDP: socket monitoring interface" - depends on INET_DIAG + depends on INET_DIAG && (IPV6 || IPV6=n) default n ---help--- Support for UDP socket monitoring interface used by the ss tool. |