4 files changed, 43 insertions, 26 deletions

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index bd513f3b9c7e..b4491c9e2a5a 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -271,10 +271,16 @@ static inline int inet_iif(const struct sk_buff *skb)
         return ((struct rtable *)skb->dst)->rt_iif;
 }
 
-extern struct sock *
-                inet_lookup_listener(struct inet_hashinfo *hashinfo,
-                                     const u32 daddr,
-                                     const unsigned short hnum, const int dif);
+extern struct sock *__inet_lookup_listener(struct inet_hashinfo *hashinfo,
+                                           const u32 daddr,
+                                           const unsigned short hnum,
+                                           const int dif);
+
+static inline struct sock *inet_lookup_listener(struct inet_hashinfo *hashinfo,
+                                                u32 daddr, u16 dport, int dif)
+{
+        return __inet_lookup_listener(hashinfo, daddr, ntohs(dport), dif);
+}
 
 /* Socket demux engine toys. */
 #ifdef __BIG_ENDIAN
@@ -362,14 +368,25 @@ hit:
         goto out;
 }
 
+static inline struct sock *
+        inet_lookup_established(struct inet_hashinfo *hashinfo,
+                                const u32 saddr, const u16 sport,
+                                const u32 daddr, const u16 dport,
+                                const int dif)
+{
+        return __inet_lookup_established(hashinfo, saddr, sport, daddr,
+                                         ntohs(dport), dif);
+}
+
 static inline struct sock *__inet_lookup(struct inet_hashinfo *hashinfo,
                                          const u32 saddr, const u16 sport,
-                                         const u32 daddr, const u16 hnum,
+                                         const u32 daddr, const u16 dport,
                                          const int dif)
 {
+        u16 hnum = ntohs(dport);
         struct sock *sk = __inet_lookup_established(hashinfo, saddr, sport, daddr,
                                                     hnum, dif);
-        return sk ? : inet_lookup_listener(hashinfo, daddr, hnum, dif);
+        return sk ? : __inet_lookup_listener(hashinfo, daddr, hnum, dif);
 }
 
 static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo,
@@ -380,7 +397,7 @@ static inline struct sock *inet_lookup(struct inet_hashinfo *hashinfo,
         struct sock *sk;
 
         local_bh_disable();
-        sk = __inet_lookup(hashinfo, saddr, sport, daddr, ntohs(dport), dif);
+        sk = __inet_lookup(hashinfo, saddr, sport, daddr, dport, dif);
         local_bh_enable();
 
         return sk;
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 171d363876ee..9a1a76a7dc41 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -608,10 +608,10 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
         if (req != NULL)
                 return dccp_check_req(sk, skb, req, prev);
 
-        nsk = __inet_lookup_established(&dccp_hashinfo,
-                                        iph->saddr, dh->dccph_sport,
-                                        iph->daddr, ntohs(dh->dccph_dport),
-                                        inet_iif(skb));
+        nsk = inet_lookup_established(&dccp_hashinfo,
+                                      iph->saddr, dh->dccph_sport,
+                                      iph->daddr, dh->dccph_dport,
+                                      inet_iif(skb));
         if (nsk != NULL) {
                 if (nsk->sk_state != DCCP_TIME_WAIT) {
                         bh_lock_sock(nsk);
@@ -925,7 +925,7 @@ static int dccp_v4_rcv(struct sk_buff *skb)
          *      Look up flow ID in table and get corresponding socket */
         sk = __inet_lookup(&dccp_hashinfo,
                            skb->nh.iph->saddr, dh->dccph_sport,
-                           skb->nh.iph->daddr, ntohs(dh->dccph_dport),
+                           skb->nh.iph->daddr, dh->dccph_dport,
                            inet_iif(skb));
 
         /* 
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index bfc39066e730..fb296c9a7f3f 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,
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index b2aa512a30e9..2973dee0a489 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -951,9 +951,9 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
         if (req)
                 return tcp_check_req(sk, skb, req, prev);
 
-        nsk = __inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,
-                                        th->source, skb->nh.iph->daddr,
-                                        ntohs(th->dest), inet_iif(skb));
+        nsk = inet_lookup_established(&tcp_hashinfo, skb->nh.iph->saddr,
+                                      th->source, skb->nh.iph->daddr,
+                                      th->dest, inet_iif(skb));
 
         if (nsk) {
                 if (nsk->sk_state != TCP_TIME_WAIT) {
@@ -1090,7 +1090,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
         TCP_SKB_CB(skb)->sacked  = 0;
 
         sk = __inet_lookup(&tcp_hashinfo, skb->nh.iph->saddr, th->source,
-                           skb->nh.iph->daddr, ntohs(th->dest),
+                           skb->nh.iph->daddr, th->dest,
                            inet_iif(skb));
 
         if (!sk)
@@ -1168,7 +1168,7 @@ do_time_wait:
         case TCP_TW_SYN: {
                 struct sock *sk2 = inet_lookup_listener(&tcp_hashinfo,
                                                         skb->nh.iph->daddr,
-                                                        ntohs(th->dest),
+                                                        th->dest,
                                                         inet_iif(skb));
                 if (sk2) {
                         inet_twsk_deschedule((struct inet_timewait_sock *)sk,