summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAnisse Astier <anisse@astier.eu>2012-02-07 07:39:11 +0000
committerDavid S. Miller <davem@davemloft.net>2012-02-07 13:35:28 -0500
commit6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd (patch)
treea474640348866b4b7f7ba14bb52978f5963191c0 /net
parent3f61cd879c2f112c468e8849949b6fc88c739679 (diff)
downloadop-kernel-dev-6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd.zip
op-kernel-dev-6d25886ee2fbc05a7bf4dae5f5ae345cb73df2fd.tar.gz
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')
-rw-r--r--net/ipv4/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index aa2a2c7..d183262 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.
OpenPOWER on IntegriCloud