diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/dccp/diag.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/dccp/diag.c')
| -rw-r--r-- | net/dccp/diag.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/diag.c b/net/dccp/diag.c index 3f78c00e3822..0f25dc395967 100644 --- a/net/dccp/diag.c +++ b/net/dccp/diag.c | |||
| @@ -30,7 +30,7 @@ static void dccp_get_info(struct sock *sk, struct tcp_info *info) | |||
| 30 | info->tcpi_backoff = icsk->icsk_backoff; | 30 | info->tcpi_backoff = icsk->icsk_backoff; |
| 31 | info->tcpi_pmtu = icsk->icsk_pmtu_cookie; | 31 | info->tcpi_pmtu = icsk->icsk_pmtu_cookie; |
| 32 | 32 | ||
| 33 | if (dp->dccps_options.dccpo_send_ack_vector) | 33 | if (dccp_msk(sk)->dccpms_send_ack_vector) |
| 34 | info->tcpi_options |= TCPI_OPT_SACK; | 34 | info->tcpi_options |= TCPI_OPT_SACK; |
| 35 | 35 | ||
| 36 | ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info); | 36 | ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info); |