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 /include/net/inet_hashtables.h | |
| parent | ab70e5862670177d207ea0e0e16454e4083a5ad5 (diff) | |
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 'include/net/inet_hashtables.h')
| -rw-r--r-- | include/net/inet_hashtables.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 0574493e3899..756ed1692906 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h @@ -203,10 +203,7 @@ void inet_hashinfo_init(struct inet_hashinfo *h); bool inet_ehash_insert(struct sock *sk, struct sock *osk); bool inet_ehash_nolisten(struct sock *sk, struct sock *osk); -int __inet_hash(struct sock *sk, struct sock *osk, - int (*saddr_same)(const struct sock *sk1, - const struct sock *sk2, - bool match_wildcard)); +int __inet_hash(struct sock *sk, struct sock *osk); int inet_hash(struct sock *sk); void inet_unhash(struct sock *sk); |