diff options
| author | Josef Bacik <jbacik@fb.com> | 2017-01-17 16:51:02 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-18 19:04:28 +0100 |
| commit | aa078842b702b4a45111f028a604a6c8f69cb27d (patch) | |
| tree | c62b434b97887bdbcc610f40f8f8dee3b1f84660 /include/net/inet_connection_sock.h | |
| parent | inet: collapse ipv4/v6 rcv_saddr_equal functions into one (diff) | |
| download | linux-aa078842b702b4a45111f028a604a6c8f69cb27d.tar.xz linux-aa078842b702b4a45111f028a604a6c8f69cb27d.zip | |
inet: drop ->bind_conflict
The only difference between inet6_csk_bind_conflict and inet_csk_bind_conflict
is how they check the rcv_saddr, so delete this call back and simply
change inet_csk_bind_conflict to call inet_rcv_saddr_equal.
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inet_connection_sock.h')
| -rw-r--r-- | include/net/inet_connection_sock.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h index 84b2edde09b1..826f198374f8 100644 --- a/include/net/inet_connection_sock.h +++ b/include/net/inet_connection_sock.h @@ -62,9 +62,6 @@ struct inet_connection_sock_af_ops { char __user *optval, int __user *optlen); #endif void (*addr2sockaddr)(struct sock *sk, struct sockaddr *); - int (*bind_conflict)(const struct sock *sk, - const struct inet_bind_bucket *tb, - bool relax, bool soreuseport_ok); void (*mtu_reduced)(struct sock *sk); }; @@ -263,9 +260,6 @@ inet_csk_rto_backoff(const struct inet_connection_sock *icsk, struct sock *inet_csk_accept(struct sock *sk, int flags, int *err); -int inet_csk_bind_conflict(const struct sock *sk, - const struct inet_bind_bucket *tb, bool relax, - bool soreuseport_ok); int inet_csk_get_port(struct sock *sk, unsigned short snum); struct dst_entry *inet_csk_route_req(const struct sock *sk, struct flowi4 *fl4, |