diff options
| author | Josef Bacik <jbacik@fb.com> | 2017-01-17 07:51:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-18 13:04:28 -0500 |
| commit | fe38d2a1c8bee0b3a0be40de5b621a28200612e5 (patch) | |
| tree | 92321ea6c293c9cd282bb7930e860885bbe96419 /net/ipv6/inet6_connection_sock.c | |
| parent | ab70e5862670177d207ea0e0e16454e4083a5ad5 (diff) | |
| download | linux-fe38d2a1c8bee0b3a0be40de5b621a28200612e5.tar.gz linux-fe38d2a1c8bee0b3a0be40de5b621a28200612e5.tar.bz2 linux-fe38d2a1c8bee0b3a0be40de5b621a28200612e5.zip | |
inet: collapse ipv4/v6 rcv_saddr_equal functions into one
We pass these per-protocol equal functions around in various places, but
we can just have one function that checks the sk->sk_family and then do
the right comparison function. I've also changed the ipv4 version to
not cast to inet_sock since it is unneeded.
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/inet6_connection_sock.c')
| -rw-r--r-- | net/ipv6/inet6_connection_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c index 7396e75e161b..55ee2ea2aee0 100644 --- a/net/ipv6/inet6_connection_sock.c +++ b/net/ipv6/inet6_connection_sock.c @@ -54,12 +54,12 @@ int inet6_csk_bind_conflict(const struct sock *sk, (sk2->sk_state != TCP_TIME_WAIT && !uid_eq(uid, sock_i_uid((struct sock *)sk2))))) { - if (ipv6_rcv_saddr_equal(sk, sk2, true)) + if (inet_rcv_saddr_equal(sk, sk2, true)) break; } if (!relax && reuse && sk2->sk_reuse && sk2->sk_state != TCP_LISTEN && - ipv6_rcv_saddr_equal(sk, sk2, true)) + inet_rcv_saddr_equal(sk, sk2, true)) break; } } |