summaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorStephen Hemminger <stephen@networkplumber.org>2019-07-03 00:20:21 +0200
committerDavid S. Miller <davem@davemloft.net>2019-07-03 20:26:35 +0200
commit1e64d7cbfdce4887008314d5b367209582223f27 (patch)
treef0b6a27f2cce0f56b78093555e65bb472097e3fb /net/ipv4
parentselftests/net: skip psock_tpacket test if KALLSYMS was not enabled (diff)
downloadlinux-1e64d7cbfdce4887008314d5b367209582223f27.tar.xz
linux-1e64d7cbfdce4887008314d5b367209582223f27.zip
net: don't warn in inet diag when IPV6 is disabled
If IPV6 was disabled, then ss command would cause a kernel warning because the command was attempting to dump IPV6 socket information. The fix is to just remove the warning. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202249 Fixes: 432490f9d455 ("net: ip, diag -- Add diag interface for raw sockets") Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/raw_diag.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c
index 899e34ceb560..e35736b99300 100644
--- a/net/ipv4/raw_diag.c
+++ b/net/ipv4/raw_diag.c
@@ -24,9 +24,6 @@ raw_get_hashinfo(const struct inet_diag_req_v2 *r)
return &raw_v6_hashinfo;
#endif
} else {
- pr_warn_once("Unexpected inet family %d\n",
- r->sdiag_family);
- WARN_ON_ONCE(1);
return ERR_PTR(-EINVAL);
}
}