| Message ID | 20190702222021.28899-1-stephen@networkplumber.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] net: don't warn in inet diag when IPV6 is disabled | expand |
From: Stephen Hemminger <stephen@networkplumber.org> Date: Tue, 2 Jul 2019 15:20:21 -0700 > 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> Applied, thanks.
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); } }
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> --- net/ipv4/raw_diag.c | 3 --- 1 file changed, 3 deletions(-)