summaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_hashtables.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-08-09 15:47:12 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 14:54:14 -0700
commit8f491069b40be5d627007a343f99759e9da6a178 (patch)
treeba2be735de32fa30015fe22febf4329c8e79ca25 /net/ipv4/inet_hashtables.c
parent832b4c5e184391773e462653aa862a8cab71f38d (diff)
downloadop-kernel-dev-8f491069b40be5d627007a343f99759e9da6a178.zip
op-kernel-dev-8f491069b40be5d627007a343f99759e9da6a178.tar.gz
[IPV4]: Use network-order dport for all visible inet_lookup_*
Right now most inet_lookup_* functions take a host-order hnum instead of a network-order dport because that's how it is represented internally. This means that users of these functions have to be careful about using the right byte-order. To add more confusion, inet_lookup takes a network-order dport unlike all other functions. So this patch changes all visible inet_lookup functions to take a dport and move all dport->hnum conversion inside them. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
-rw-r--r--net/ipv4/inet_hashtables.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index bfc39066..fb296c9 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -124,10 +124,10 @@ EXPORT_SYMBOL(inet_listen_wlock);
* remote address for the connection. So always assume those are both
* wildcarded during the search since they can never be otherwise.
*/
-static struct sock *__inet_lookup_listener(const struct hlist_head *head,
- const u32 daddr,
- const unsigned short hnum,
- const int dif)
+static struct sock *inet_lookup_listener_slow(const struct hlist_head *head,
+ const u32 daddr,
+ const unsigned short hnum,
+ const int dif)
{
struct sock *result = NULL, *sk;
const struct hlist_node *node;
@@ -162,9 +162,9 @@ static struct sock *__inet_lookup_listener(const struct hlist_head *head,
}
/* Optimize the common listener case. */
-struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,
- const u32 daddr, const unsigned short hnum,
- const int dif)
+struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
+ const u32 daddr, const unsigned short hnum,
+ const int dif)
{
struct sock *sk = NULL;
const struct hlist_head *head;
@@ -179,7 +179,7 @@ struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,
(sk->sk_family == PF_INET || !ipv6_only_sock(sk)) &&
!sk->sk_bound_dev_if)
goto sherry_cache;
- sk = __inet_lookup_listener(head, daddr, hnum, dif);
+ sk = inet_lookup_listener_slow(head, daddr, hnum, dif);
}
if (sk) {
sherry_cache:
@@ -188,7 +188,7 @@ sherry_cache:
read_unlock(&hashinfo->lhash_lock);
return sk;
}
-EXPORT_SYMBOL_GPL(inet_lookup_listener);
+EXPORT_SYMBOL_GPL(__inet_lookup_listener);
/* called with local bh disabled */
static int __inet_check_established(struct inet_timewait_death_row *death_row,
OpenPOWER on IntegriCloud