diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2019-07-02 15:20:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-01 08:26:11 +0200 |
| commit | 8ffd7ba9ffb1e332c092a7523dc76de9d0958bd1 (patch) | |
| tree | 1aae286d2985dd86add24b06d7311d6f00be03b3 /net | |
| parent | ff0fbfacc94f94afae61fd06f44a0d5ac199008c (diff) | |
| download | linux-stable-8ffd7ba9ffb1e332c092a7523dc76de9d0958bd1.tar.gz linux-stable-8ffd7ba9ffb1e332c092a7523dc76de9d0958bd1.tar.bz2 linux-stable-8ffd7ba9ffb1e332c092a7523dc76de9d0958bd1.zip | |
net: don't warn in inet diag when IPV6 is disabled
[ Upstream commit 1e64d7cbfdce4887008314d5b367209582223f27 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/raw_diag.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/raw_diag.c b/net/ipv4/raw_diag.c index c200065ef9a5..6367ecdf76c4 100644 --- a/net/ipv4/raw_diag.c +++ b/net/ipv4/raw_diag.c @@ -23,9 +23,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); } } |