[TCP]: Move seq_ops from tcp_iter_state to tcp_seq_afinfo.

[pandora-kernel.git] / include / net / inet_sock.h

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index 70013c5..a42cd63 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -43,8 +43,7 @@ struct ip_options {
        unsigned char   srr;
        unsigned char   rr;
        unsigned char   ts;
-       unsigned char   is_data:1,
-                       is_strictroute:1,
+       unsigned char   is_strictroute:1,
                        srr_is_hit:1,
                        is_changed:1,
                        rr_needaddr:1,
@@ -137,7 +136,7 @@ struct inet_sock {
                unsigned int            flags;
                unsigned int            fragsize;
                struct ip_options       *opt;
-               struct rtable           *rt;
+               struct dst_entry        *dst;
                int                     length; /* Total length of all frames */
                __be32                  addr;
                struct flowi            fl;
@@ -175,7 +174,8 @@ extern void build_ehash_secret(void);
 static inline unsigned int inet_ehashfn(const __be32 laddr, const __u16 lport,
                                        const __be32 faddr, const __be16 fport)
 {
-       return jhash_2words((__force __u32) laddr ^ (__force __u32) faddr,
+       return jhash_3words((__force __u32) laddr,
+                           (__force __u32) faddr,
                            ((__u32) lport) << 16 | (__force __u32)fport,
                            inet_ehash_secret);
 }
@@ -194,7 +194,7 @@ static inline int inet_sk_ehashfn(const struct sock *sk)
 
 static inline int inet_iif(const struct sk_buff *skb)
 {
-       return ((struct rtable *)skb->dst)->rt_iif;
+       return skb->rtable->rt_iif;
 }
 
 #endif /* _INET_SOCK_H */