net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks
authorWillem de Bruijn <willemb@google.com>
Wed, 26 Nov 2014 19:53:02 +0000 (14:53 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 16 Dec 2014 17:37:10 +0000 (09:37 -0800)
commit433337f9c00cac447d020922f59237273f5d92be
tree8a6d8f035637fd586ace6a19cea3202027c1a321
parent79fa8e2338280f1f7954d25ce5b5791b3472bcfa
net-timestamp: make tcp_recvmsg call ipv6_recv_error for AF_INET6 socks

[ Upstream commit f4713a3dfad045d46afcb9c2a7d0bba288920ed4 ]

TCP timestamping introduced MSG_ERRQUEUE handling for TCP sockets.
If the socket is of family AF_INET6, call ipv6_recv_error instead
of ip_recv_error.

This change is more complex than a single branch due to the loadable
ipv6 module. It reuses a pre-existing indirect function call from
ping. The ping code is safe to call, because it is part of the core
ipv6 module and always present when AF_INET6 sockets are active.

Fixes: 4ed2d765 (net-timestamp: TCP timestamping)
Signed-off-by: Willem de Bruijn <willemb@google.com>
----

It may also be worthwhile to add WARN_ON_ONCE(sk->family == AF_INET6)
to ip_recv_error.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/net/inet_common.h
net/ipv4/af_inet.c
net/ipv4/ping.c
net/ipv4/tcp.c