f4713a3dfa
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>
49 lines
1.6 KiB
C
49 lines
1.6 KiB
C
#ifndef _INET_COMMON_H
|
|
#define _INET_COMMON_H
|
|
|
|
extern const struct proto_ops inet_stream_ops;
|
|
extern const struct proto_ops inet_dgram_ops;
|
|
|
|
/*
|
|
* INET4 prototypes used by INET6
|
|
*/
|
|
|
|
struct msghdr;
|
|
struct sock;
|
|
struct sockaddr;
|
|
struct socket;
|
|
|
|
int inet_release(struct socket *sock);
|
|
int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
|
int addr_len, int flags);
|
|
int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
|
int addr_len, int flags);
|
|
int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
|
|
int addr_len, int flags);
|
|
int inet_accept(struct socket *sock, struct socket *newsock, int flags);
|
|
int inet_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|
size_t size);
|
|
ssize_t inet_sendpage(struct socket *sock, struct page *page, int offset,
|
|
size_t size, int flags);
|
|
int inet_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
|
|
size_t size, int flags);
|
|
int inet_shutdown(struct socket *sock, int how);
|
|
int inet_listen(struct socket *sock, int backlog);
|
|
void inet_sock_destruct(struct sock *sk);
|
|
int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len);
|
|
int inet_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len,
|
|
int peer);
|
|
int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
|
|
int inet_ctl_sock_create(struct sock **sk, unsigned short family,
|
|
unsigned short type, unsigned char protocol,
|
|
struct net *net);
|
|
int inet_recv_error(struct sock *sk, struct msghdr *msg, int len,
|
|
int *addr_len);
|
|
|
|
static inline void inet_ctl_sock_destroy(struct sock *sk)
|
|
{
|
|
sk_release_kernel(sk);
|
|
}
|
|
|
|
#endif
|