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/xfrm/xfrm_state.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/xfrm/xfrm_state.c')
-rw-r--r-- | net/xfrm/xfrm_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index e3a0bcfa5df1..63a20e818164 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -233,7 +233,7 @@ static inline unsigned long make_jiffies(long secs) | |||
233 | static void xfrm_timer_handler(unsigned long data) | 233 | static void xfrm_timer_handler(unsigned long data) |
234 | { | 234 | { |
235 | struct xfrm_state *x = (struct xfrm_state*)data; | 235 | struct xfrm_state *x = (struct xfrm_state*)data; |
236 | unsigned long now = (unsigned long)xtime.tv_sec; | 236 | unsigned long now = get_seconds(); |
237 | long next = LONG_MAX; | 237 | long next = LONG_MAX; |
238 | int warn = 0; | 238 | int warn = 0; |
239 | int err = 0; | 239 | int err = 0; |
@@ -326,7 +326,7 @@ struct xfrm_state *xfrm_state_alloc(void) | |||
326 | init_timer(&x->rtimer); | 326 | init_timer(&x->rtimer); |
327 | x->rtimer.function = xfrm_replay_timer_handler; | 327 | x->rtimer.function = xfrm_replay_timer_handler; |
328 | x->rtimer.data = (unsigned long)x; | 328 | x->rtimer.data = (unsigned long)x; |
329 | x->curlft.add_time = (unsigned long)xtime.tv_sec; | 329 | x->curlft.add_time = get_seconds(); |
330 | x->lft.soft_byte_limit = XFRM_INF; | 330 | x->lft.soft_byte_limit = XFRM_INF; |
331 | x->lft.soft_packet_limit = XFRM_INF; | 331 | x->lft.soft_packet_limit = XFRM_INF; |
332 | x->lft.hard_byte_limit = XFRM_INF; | 332 | x->lft.hard_byte_limit = XFRM_INF; |
@@ -1051,7 +1051,7 @@ EXPORT_SYMBOL(xfrm_state_update); | |||
1051 | int xfrm_state_check_expire(struct xfrm_state *x) | 1051 | int xfrm_state_check_expire(struct xfrm_state *x) |
1052 | { | 1052 | { |
1053 | if (!x->curlft.use_time) | 1053 | if (!x->curlft.use_time) |
1054 | x->curlft.use_time = (unsigned long)xtime.tv_sec; | 1054 | x->curlft.use_time = get_seconds(); |
1055 | 1055 | ||
1056 | if (x->km.state != XFRM_STATE_VALID) | 1056 | if (x->km.state != XFRM_STATE_VALID) |
1057 | return -EINVAL; | 1057 | return -EINVAL; |