diff options
author | James Morris <jmorris@namei.org> | 2007-03-04 19:12:44 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:23:32 -0400 |
commit | 9d729f72dca9406025bcfa9c1f660d71d9ef0ff5 (patch) | |
tree | 69a3ca50c6e266853676a545a113f13f254ae535 /net/ipv4/tcp_minisocks.c | |
parent | 39df232f1a9ba48d41c68ee7d4046756e709cf91 (diff) |
[NET]: Convert xtime.tv_sec to get_seconds()
Where appropriate, convert references to xtime.tv_sec to the
get_seconds() helper function.
Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_minisocks.c')
-rw-r--r-- | net/ipv4/tcp_minisocks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 706932726a11..ac4ce48a6599 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
@@ -149,7 +149,7 @@ kill_with_rst: | |||
149 | tw->tw_substate = TCP_TIME_WAIT; | 149 | tw->tw_substate = TCP_TIME_WAIT; |
150 | tcptw->tw_rcv_nxt = TCP_SKB_CB(skb)->end_seq; | 150 | tcptw->tw_rcv_nxt = TCP_SKB_CB(skb)->end_seq; |
151 | if (tmp_opt.saw_tstamp) { | 151 | if (tmp_opt.saw_tstamp) { |
152 | tcptw->tw_ts_recent_stamp = xtime.tv_sec; | 152 | tcptw->tw_ts_recent_stamp = get_seconds(); |
153 | tcptw->tw_ts_recent = tmp_opt.rcv_tsval; | 153 | tcptw->tw_ts_recent = tmp_opt.rcv_tsval; |
154 | } | 154 | } |
155 | 155 | ||
@@ -208,7 +208,7 @@ kill: | |||
208 | 208 | ||
209 | if (tmp_opt.saw_tstamp) { | 209 | if (tmp_opt.saw_tstamp) { |
210 | tcptw->tw_ts_recent = tmp_opt.rcv_tsval; | 210 | tcptw->tw_ts_recent = tmp_opt.rcv_tsval; |
211 | tcptw->tw_ts_recent_stamp = xtime.tv_sec; | 211 | tcptw->tw_ts_recent_stamp = get_seconds(); |
212 | } | 212 | } |
213 | 213 | ||
214 | inet_twsk_put(tw); | 214 | inet_twsk_put(tw); |
@@ -458,7 +458,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, | |||
458 | 458 | ||
459 | if (newtp->rx_opt.tstamp_ok) { | 459 | if (newtp->rx_opt.tstamp_ok) { |
460 | newtp->rx_opt.ts_recent = req->ts_recent; | 460 | newtp->rx_opt.ts_recent = req->ts_recent; |
461 | newtp->rx_opt.ts_recent_stamp = xtime.tv_sec; | 461 | newtp->rx_opt.ts_recent_stamp = get_seconds(); |
462 | newtp->tcp_header_len = sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED; | 462 | newtp->tcp_header_len = sizeof(struct tcphdr) + TCPOLEN_TSTAMP_ALIGNED; |
463 | } else { | 463 | } else { |
464 | newtp->rx_opt.ts_recent_stamp = 0; | 464 | newtp->rx_opt.ts_recent_stamp = 0; |
@@ -504,7 +504,7 @@ struct sock *tcp_check_req(struct sock *sk,struct sk_buff *skb, | |||
504 | * it can be estimated (approximately) | 504 | * it can be estimated (approximately) |
505 | * from another data. | 505 | * from another data. |
506 | */ | 506 | */ |
507 | tmp_opt.ts_recent_stamp = xtime.tv_sec - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans); | 507 | tmp_opt.ts_recent_stamp = get_seconds() - ((TCP_TIMEOUT_INIT/HZ)<<req->retrans); |
508 | paws_reject = tcp_paws_check(&tmp_opt, th->rst); | 508 | paws_reject = tcp_paws_check(&tmp_opt, th->rst); |
509 | } | 509 | } |
510 | } | 510 | } |