3 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/ip.h b/include/linux/ip.h
index 33e8a19a1a0f..2c54bbd3da76 100644
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
@@ -128,6 +128,7 @@ static inline struct inet_request_sock *inet_rsk(const struct request_sock *sk)
         return (struct inet_request_sock *)sk;
 }
 
+struct inet_bind_bucket;
 struct ipv6_pinfo;
 
 struct inet_sock {
@@ -157,6 +158,7 @@ struct inet_sock {
         int                     mc_index;       /* Multicast device index */
         __u32                   mc_addr;
         struct ip_mc_socklist   *mc_list;       /* Group array */
+        struct inet_bind_bucket *bind_hash;
         /*
          * Following members are used to retain the infomation to build
          * an ip header on each ip fragmentation while the socket is corked.
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index ec580a560e8c..e70ab19652db 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -258,7 +258,6 @@ struct tcp_sock {
         __u32   snd_sml;        /* Last byte of the most recently transmitted small packet */
         __u32   rcv_tstamp;     /* timestamp of last received ACK (for keepalives) */
         __u32   lsndtime;       /* timestamp of last sent data packet (for restart window) */
-        struct inet_bind_bucket *bind_hash;
         /* Delayed ACK control data */
         struct {
                 __u8    pending;        /* ACK is pending */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index ff5d30ac2b06..6c6c879e7e87 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1266,7 +1266,7 @@ static __inline__ void tcp_set_state(struct sock *sk, int state)
                         TCP_INC_STATS(TCP_MIB_ESTABRESETS);
 
                 sk->sk_prot->unhash(sk);
-                if (tcp_sk(sk)->bind_hash &&
+                if (inet_sk(sk)->bind_hash &&
                     !(sk->sk_userlocks & SOCK_BINDPORT_LOCK))
                         tcp_put_port(sk);
                 /* fall through */