[SOCK]: Add udp_hash member to struct proto.

Inspired by the commit ab1e0a13 ([SOCK] proto: Add hashinfo member to 
struct proto) from Arnaldo, I made similar thing for UDP/-Lite IPv4 
and -v6 protocols.

The result is not that exciting, but it removes some levels of
indirection in udpxxx_get_port and saves some space in code and text.

The first step is to union existing hashinfo and new udp_hash on the
struct proto and give a name to this union, since future initialization 
of tcpxxx_prot, dccp_vx_protinfo and udpxxx_protinfo will cause gcc 
warning about inability to initialize anonymous member this way.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

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;