[DCCP]: Don't alloc ack vector for the control sock

[powerpc.git] / net / dccp / diag.c

diff --git a/net/dccp/diag.c b/net/dccp/diag.c
index 4d9037c..3f78c00 100644 (file)
--- a/net/dccp/diag.c
+++ b/net/dccp/diag.c
@@ -12,21 +12,45 @@
 #include <linux/config.h>
 
 #include <linux/module.h>
-#include <linux/tcp_diag.h>
+#include <linux/inet_diag.h>
 
+#include "ccid.h"
 #include "dccp.h"
 
-static void dccp_diag_get_info(struct sock *sk, struct tcpdiagmsg *r,
+static void dccp_get_info(struct sock *sk, struct tcp_info *info)
+{
+       struct dccp_sock *dp = dccp_sk(sk);
+       const struct inet_connection_sock *icsk = inet_csk(sk);
+
+       memset(info, 0, sizeof(*info));
+
+       info->tcpi_state        = sk->sk_state;
+       info->tcpi_retransmits  = icsk->icsk_retransmits;
+       info->tcpi_probes       = icsk->icsk_probes_out;
+       info->tcpi_backoff      = icsk->icsk_backoff;
+       info->tcpi_pmtu         = icsk->icsk_pmtu_cookie;
+
+       if (dp->dccps_options.dccpo_send_ack_vector)
+               info->tcpi_options |= TCPI_OPT_SACK;
+
+       ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info);
+       ccid_hc_tx_get_info(dp->dccps_hc_tx_ccid, sk, info);
+}
+
+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;
+
+       if (_info != NULL)
+               dccp_get_info(sk, _info);
 }
 
 static struct inet_diag_handler dccp_diag_handler = {
        .idiag_hashinfo  = &dccp_hashinfo,
        .idiag_get_info  = dccp_diag_get_info,
        .idiag_type      = DCCPDIAG_GETSOCK,
-       .idiag_info_size = 0,
+       .idiag_info_size = sizeof(struct tcp_info),
 };
 
 static int __init dccp_diag_init(void)