2 files changed, 5 insertions, 2 deletions

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 97dc35ad09be..d99c1ba2ece0 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -223,7 +223,7 @@ static inline int inet_sk_listen_hashfn(const struct sock *sk)
 /* Caller must disable local BH processing. */
 static inline void __inet_inherit_port(struct sock *sk, struct sock *child)
 {
-        struct inet_hashinfo *table = sk->sk_prot->hashinfo;
+        struct inet_hashinfo *table = sk->sk_prot->h.hashinfo;
         const int bhash = inet_bhashfn(inet_sk(child)->num, table->bhash_size);
         struct inet_bind_hashbucket *head = &table->bhash[bhash];
         struct inet_bind_bucket *tb;
diff --git a/include/net/sock.h b/include/net/sock.h
index b89680d2693b..c3175c400b79 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -586,7 +586,10 @@ struct proto {
         struct request_sock_ops *rsk_prot;
         struct timewait_sock_ops *twsk_prot;
 
-        struct inet_hashinfo    *hashinfo;
+        union {
+                struct inet_hashinfo    *hashinfo;
+                struct hlist_head       *udp_hash;
+        } h;
 
         struct module           *owner;