3 files changed, 6 insertions, 6 deletions

diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index cc1a1859a61b..f9c5c4def1ba 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -80,7 +80,7 @@ EXPORT_SYMBOL_GPL(inet_csk_bind_conflict);
  */
 int inet_csk_get_port(struct sock *sk, unsigned short snum)
 {
-        struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+        struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
         struct inet_bind_hashbucket *head;
         struct hlist_node *node;
         struct inet_bind_bucket *tb;
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
index 1aba606f6bbb..8cd1ad9b9111 100644
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
@@ -68,7 +68,7 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb,
  */
 static void __inet_put_port(struct sock *sk)
 {
-        struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+        struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
         const int bhash = inet_bhashfn(inet_sk(sk)->num, hashinfo->bhash_size);
         struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash];
         struct inet_bind_bucket *tb;
@@ -318,7 +318,7 @@ static inline u32 inet_sk_port_offset(const struct sock *sk)
 
 void __inet_hash_nolisten(struct sock *sk)
 {
-        struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+        struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
         struct hlist_head *list;
         rwlock_t *lock;
         struct inet_ehash_bucket *head;
@@ -339,7 +339,7 @@ EXPORT_SYMBOL_GPL(__inet_hash_nolisten);
 
 static void __inet_hash(struct sock *sk)
 {
-        struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+        struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
         struct hlist_head *list;
         rwlock_t *lock;
 
@@ -372,7 +372,7 @@ EXPORT_SYMBOL_GPL(inet_hash);
 void inet_unhash(struct sock *sk)
 {
         rwlock_t *lock;
-        struct inet_hashinfo *hashinfo = sk->sk_prot->hashinfo;
+        struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo;
 
         if (sk_unhashed(sk))
                 goto out;
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 167a0f557531..1a47719a55ad 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2468,7 +2468,7 @@ struct proto tcp_prot = {
         .obj_size               = sizeof(struct tcp_sock),
         .twsk_prot              = &tcp_timewait_sock_ops,
         .rsk_prot               = &tcp_request_sock_ops,
-        .hashinfo               = &tcp_hashinfo,
+        .h.hashinfo             = &tcp_hashinfo,
 #ifdef CONFIG_COMPAT
         .compat_setsockopt      = compat_tcp_setsockopt,
         .compat_getsockopt      = compat_tcp_getsockopt,