diff options
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r-- | net/dccp/options.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c index eabcc8f1c625..382c5894acb2 100644 --- a/net/dccp/options.c +++ b/net/dccp/options.c | |||
@@ -359,7 +359,7 @@ static void dccp_insert_option_ack_vector(struct sock *sk, struct sk_buff *skb) | |||
359 | #endif | 359 | #endif |
360 | struct dccp_ackpkts *ap = dp->dccps_hc_rx_ackpkts; | 360 | struct dccp_ackpkts *ap = dp->dccps_hc_rx_ackpkts; |
361 | int len = ap->dccpap_buf_vector_len + 2; | 361 | int len = ap->dccpap_buf_vector_len + 2; |
362 | const u32 elapsed_time = now_delta(ap->dccpap_time) / 10; | 362 | const u32 elapsed_time = timeval_now_delta(&ap->dccpap_time) / 10; |
363 | unsigned char *to, *from; | 363 | unsigned char *to, *from; |
364 | 364 | ||
365 | if (elapsed_time != 0) | 365 | if (elapsed_time != 0) |
@@ -451,7 +451,8 @@ static void dccp_insert_option_timestamp_echo(struct sock *sk, | |||
451 | "CLIENT TX opt: " : "server TX opt: "; | 451 | "CLIENT TX opt: " : "server TX opt: "; |
452 | #endif | 452 | #endif |
453 | u32 tstamp_echo; | 453 | u32 tstamp_echo; |
454 | const u32 elapsed_time = now_delta(dp->dccps_timestamp_time) / 10; | 454 | const u32 elapsed_time = |
455 | timeval_now_delta(&dp->dccps_timestamp_time) / 10; | ||
455 | const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time); | 456 | const int elapsed_time_len = dccp_elapsed_time_len(elapsed_time); |
456 | const int len = 6 + elapsed_time_len; | 457 | const int len = 6 + elapsed_time_len; |
457 | unsigned char *to; | 458 | unsigned char *to; |