Pull acpica into release branch

[linux-2.6] / net / dccp / diag.c

diff --git a/net/dccp/diag.c b/net/dccp/diag.c
index f675d8e642d3e4d2d57c706fc18652c26ba25e7e..0f25dc395967b5b0ef8ba61ff336f5ae70988cf4 100644 (file)
--- a/net/dccp/diag.c
+++ b/net/dccp/diag.c
@@ -28,9 +28,9 @@ static void dccp_get_info(struct sock *sk, struct tcp_info *info)
        info->tcpi_retransmits  = icsk->icsk_retransmits;
        info->tcpi_probes       = icsk->icsk_probes_out;
        info->tcpi_backoff      = icsk->icsk_backoff;
-       info->tcpi_pmtu         = dp->dccps_pmtu_cookie;
+       info->tcpi_pmtu         = icsk->icsk_pmtu_cookie;
 
-       if (dp->dccps_options.dccpo_send_ack_vector)
+       if (dccp_msk(sk)->dccpms_send_ack_vector)
                info->tcpi_options |= TCPI_OPT_SACK;
 
        ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info);