diff options
| author |   Josef Bacik <jbacik@fb.com> | 2017-01-17 07:51:02 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-01-18 13:04:28 -0500 |
| commit | aa078842b702b4a45111f028a604a6c8f69cb27d (patch) | |
| tree | c62b434b97887bdbcc610f40f8f8dee3b1f84660 /net/ipv4/tcp_ipv4.c | |
| parent | inet: collapse ipv4/v6 rcv_saddr_equal functions into one (diff) | |
| download | linux-dev-aa078842b702b4a45111f028a604a6c8f69cb27d.tar.xz linux-dev-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 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 63214136cf1c..3644fc117691 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1817,7 +1817,6 @@ const struct inet_connection_sock_af_ops ipv4_specific = { .getsockopt = ip_getsockopt, .addr2sockaddr = inet_csk_addr2sockaddr, .sockaddr_len = sizeof(struct sockaddr_in), - .bind_conflict = inet_csk_bind_conflict, #ifdef CONFIG_COMPAT .compat_setsockopt = compat_ip_setsockopt, .compat_getsockopt = compat_ip_getsockopt, |