[INET]: Move tcp_port_rover to inet_hashinfo

Also expose all of the tcp_hashinfo members, i.e. killing those
tcp_ehash, etc macros, this will more clearly expose already generic
functions and some that need just a bit of work to become generic, as
we'll see in the upcoming changesets.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index 5bb6a0f1c77b..0ae738b455f0 100644
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -595,7 +595,7 @@ static int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb)
                         struct hlist_node *node;
 
                         num = 0;
-                        sk_for_each(sk, node, &tcp_listening_hash[i]) {
+                        sk_for_each(sk, node, &tcp_hashinfo.listening_hash[i]) {
                                 struct inet_sock *inet = inet_sk(sk);
 
                                 if (num < s_num) {
@@ -645,8 +645,8 @@ skip_listen_ht:
         if (!(r->tcpdiag_states&~(TCPF_LISTEN|TCPF_SYN_RECV)))
                 return skb->len;
 
-        for (i = s_i; i < tcp_ehash_size; i++) {
-                struct inet_ehash_bucket *head = &tcp_ehash[i];
+        for (i = s_i; i < tcp_hashinfo.ehash_size; i++) {
+                struct inet_ehash_bucket *head = &tcp_hashinfo.ehash[i];
                 struct sock *sk;
                 struct hlist_node *node;
 
@@ -678,7 +678,7 @@ next_normal:
 
                 if (r->tcpdiag_states&TCPF_TIME_WAIT) {
                         sk_for_each(sk, node,
-                                    &tcp_ehash[i + tcp_ehash_size].chain) {
+                                    &tcp_hashinfo.ehash[i + tcp_hashinfo.ehash_size].chain) {
                                 struct inet_sock *inet = inet_sk(sk);
 
                                 if (num < s_num)