aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/options.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2005-08-27 17:18:18 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-29 19:11:56 -0400
commitb6ee3d4ada4e85d9b9b9164c1327ef0850c79d5e (patch)
tree26dfc68ab042ebb8186fe3a93a34723cb1faaae1 /net/dccp/options.c
parent1f2333aea3269e196c44ae9a220e714cc1427792 (diff)
[CCID3]: Reorganise timeval handling
Introducing functions to add to or subtract from a timeval variable and renaming now_delta to timeval_new_delta that calls do_gettimeofday and then timeval_delta, that should be used when there are several deltas made relative to the current time or setting variables to it, so as to avoid calling do_gettimeofday excessively. I'm leaving these "timeval_" prefixed funcions internal to DCCP for a while till we're sure there are no subtle bugs in it. It also is more correct as it checks if the number of usecs added to or subtracted from a tv_usec field is more than 2 seconds. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r--net/dccp/options.c5
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;