projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'regmap-fix-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
inet_diag.c
diff --git
a/net/ipv4/inet_diag.c
b/net/ipv4/inet_diag.c
index 9bc26677058e0420739e4a7bcb7ffd1b593d6e67..c3b1f3a0f4cf63df6c7e862f96e44c8653d3a476 100644
(file)
--- a/
net/ipv4/inet_diag.c
+++ b/
net/ipv4/inet_diag.c
@@
-152,8
+152,8
@@
int inet_sk_diag_fill(struct sock *sk, struct inet_connection_sock *icsk,
inet6_sk(sk)->tclass) < 0)
goto errout;
inet6_sk(sk)->tclass) < 0)
goto errout;
- if (
ipv6_only_sock(sk
) &&
- nla_put_u8(skb, INET_DIAG_SKV6ONLY,
1
))
+ if (
((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)
) &&
+ nla_put_u8(skb, INET_DIAG_SKV6ONLY,
ipv6_only_sock(sk)
))
goto errout;
}
#endif
goto errout;
}
#endif