[NET]: change layout of ehash table
[linux-2.6.git] / net / ipv6 / inet6_hashtables.c
index 8accd1f..e611169 100644 (file)
@@ -57,7 +57,7 @@ EXPORT_SYMBOL(__inet6_hash);
  */
 struct sock *__inet6_lookup_established(struct inet_hashinfo *hashinfo,
                                           const struct in6_addr *saddr,
-                                          const u16 sport,
+                                          const __be16 sport,
                                           const struct in6_addr *daddr,
                                           const u16 hnum,
                                           const int dif)
@@ -79,7 +79,7 @@ struct sock *__inet6_lookup_established(struct inet_hashinfo *hashinfo,
                        goto hit; /* You sunk my battleship! */
        }
        /* Must check for a TIME_WAIT'er before going to listener hash. */
-       sk_for_each(sk, node, &(head + hashinfo->ehash_size)->chain) {
+       sk_for_each(sk, node, &head->twchain) {
                const struct inet_timewait_sock *tw = inet_twsk(sk);
 
                if(*((__portpair *)&(tw->tw_dport))     == ports        &&
@@ -146,8 +146,8 @@ struct sock *inet6_lookup_listener(struct inet_hashinfo *hashinfo,
 EXPORT_SYMBOL_GPL(inet6_lookup_listener);
 
 struct sock *inet6_lookup(struct inet_hashinfo *hashinfo,
-                         const struct in6_addr *saddr, const u16 sport,
-                         const struct in6_addr *daddr, const u16 dport,
+                         const struct in6_addr *saddr, const __be16 sport,
+                         const struct in6_addr *daddr, const __be16 dport,
                          const int dif)
 {
        struct sock *sk;
@@ -183,7 +183,7 @@ static int __inet6_check_established(struct inet_timewait_death_row *death_row,
        write_lock(&head->lock);
 
        /* Check TIME-WAIT sockets first. */
-       sk_for_each(sk2, node, &(head + hinfo->ehash_size)->chain) {
+       sk_for_each(sk2, node, &head->twchain) {
                const struct inet6_timewait_sock *tw6 = inet6_twsk(sk2);
 
                tw = inet_twsk(sk2);