diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-08-08 05:18:10 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:54:11 -0400 |
commit | 99a92ff50424146ba01a222248fd47a1cd55b78f (patch) | |
tree | 85f78f657bfb7379206d3b27c5c3fa77bb7a1cd9 /include/net/inet_hashtables.h | |
parent | 1a01912ae0a5666c4c24eaae2b4821711e2ad79a (diff) |
[IPV4]: Uninline inet_lookup_listener
By modern standards this function is way too big to be inlined. It's
even bigger than __inet_lookup_listener :)
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 98e0bb3014fe..bd513f3b9c7e 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h | |||
@@ -271,39 +271,10 @@ static inline int inet_iif(const struct sk_buff *skb) | |||
271 | return ((struct rtable *)skb->dst)->rt_iif; | 271 | return ((struct rtable *)skb->dst)->rt_iif; |
272 | } | 272 | } |
273 | 273 | ||
274 | extern struct sock *__inet_lookup_listener(const struct hlist_head *head, | 274 | extern struct sock * |
275 | const u32 daddr, | ||
276 | const unsigned short hnum, | ||
277 | const int dif); | ||
278 | |||
279 | /* Optimize the common listener case. */ | ||
280 | static inline struct sock * | ||
281 | inet_lookup_listener(struct inet_hashinfo *hashinfo, | 275 | inet_lookup_listener(struct inet_hashinfo *hashinfo, |
282 | const u32 daddr, | 276 | const u32 daddr, |
283 | const unsigned short hnum, const int dif) | 277 | const unsigned short hnum, const int dif); |
284 | { | ||
285 | struct sock *sk = NULL; | ||
286 | const struct hlist_head *head; | ||
287 | |||
288 | read_lock(&hashinfo->lhash_lock); | ||
289 | head = &hashinfo->listening_hash[inet_lhashfn(hnum)]; | ||
290 | if (!hlist_empty(head)) { | ||
291 | const struct inet_sock *inet = inet_sk((sk = __sk_head(head))); | ||
292 | |||
293 | if (inet->num == hnum && !sk->sk_node.next && | ||
294 | (!inet->rcv_saddr || inet->rcv_saddr == daddr) && | ||
295 | (sk->sk_family == PF_INET || !ipv6_only_sock(sk)) && | ||
296 | !sk->sk_bound_dev_if) | ||
297 | goto sherry_cache; | ||
298 | sk = __inet_lookup_listener(head, daddr, hnum, dif); | ||
299 | } | ||
300 | if (sk) { | ||
301 | sherry_cache: | ||
302 | sock_hold(sk); | ||
303 | } | ||
304 | read_unlock(&hashinfo->lhash_lock); | ||
305 | return sk; | ||
306 | } | ||
307 | 278 | ||
308 | /* Socket demux engine toys. */ | 279 | /* Socket demux engine toys. */ |
309 | #ifdef __BIG_ENDIAN | 280 | #ifdef __BIG_ENDIAN |