[TCPDIAG]: Just rename everything to inet_diag

Next changeset will rename tcp_diag.[ch] to inet_diag.[ch].

I'm taking this longer route so as to easy review, making clear the changes
made all along the way.

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

2 files changed, 4 insertions, 4 deletions

diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig
index ff5b5459b97a..efce4f346fd0 100644
--- a/net/dccp/Kconfig
+++ b/net/dccp/Kconfig
@@ -20,8 +20,8 @@ config IP_DCCP
           If in doubt, say N.
 
 config IP_DCCP_DIAG
-        depends on IP_DCCP && IP_TCPDIAG
-        def_tristate y if (IP_DCCP = y && IP_TCPDIAG = y)
+        depends on IP_DCCP && IP_INET_DIAG
+        def_tristate y if (IP_DCCP = y && IP_INET_DIAG = y)
         def_tristate m
 
 source "net/dccp/ccids/Kconfig"
diff --git a/net/dccp/diag.c b/net/dccp/diag.c
index 4d9037c56ddc..9f07eff2e3b6 100644
--- a/net/dccp/diag.c
+++ b/net/dccp/diag.c
@@ -16,10 +16,10 @@
 
 #include "dccp.h"
 
-static void dccp_diag_get_info(struct sock *sk, struct tcpdiagmsg *r,
+static void dccp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
                                void *_info)
 {
-        r->tcpdiag_rqueue = r->tcpdiag_wqueue = 0;
+        r->idiag_rqueue = r->idiag_wqueue = 0;
 }
 
 static struct inet_diag_handler dccp_diag_handler = {