[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>
This commit is contained in:
committed by
David S. Miller
parent
39df232f1a
commit
9d729f72dc
@@ -268,7 +268,7 @@ static inline unsigned long make_jiffies(long secs)
|
||||
static void xfrm_policy_timer(unsigned long data)
|
||||
{
|
||||
struct xfrm_policy *xp = (struct xfrm_policy*)data;
|
||||
unsigned long now = (unsigned long)xtime.tv_sec;
|
||||
unsigned long now = get_seconds();
|
||||
long next = LONG_MAX;
|
||||
int warn = 0;
|
||||
int dir;
|
||||
@@ -690,7 +690,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
|
||||
}
|
||||
policy->index = delpol ? delpol->index : xfrm_gen_index(policy->type, dir);
|
||||
hlist_add_head(&policy->byidx, xfrm_policy_byidx+idx_hash(policy->index));
|
||||
policy->curlft.add_time = (unsigned long)xtime.tv_sec;
|
||||
policy->curlft.add_time = get_seconds();
|
||||
policy->curlft.use_time = 0;
|
||||
if (!mod_timer(&policy->timer, jiffies + HZ))
|
||||
xfrm_pol_hold(policy);
|
||||
@@ -1133,7 +1133,7 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol)
|
||||
old_pol = sk->sk_policy[dir];
|
||||
sk->sk_policy[dir] = pol;
|
||||
if (pol) {
|
||||
pol->curlft.add_time = (unsigned long)xtime.tv_sec;
|
||||
pol->curlft.add_time = get_seconds();
|
||||
pol->index = xfrm_gen_index(pol->type, XFRM_POLICY_MAX+dir);
|
||||
__xfrm_policy_link(pol, XFRM_POLICY_MAX+dir);
|
||||
}
|
||||
@@ -1386,7 +1386,7 @@ restart:
|
||||
return 0;
|
||||
|
||||
family = dst_orig->ops->family;
|
||||
policy->curlft.use_time = (unsigned long)xtime.tv_sec;
|
||||
policy->curlft.use_time = get_seconds();
|
||||
pols[0] = policy;
|
||||
npols ++;
|
||||
xfrm_nr += pols[0]->xfrm_nr;
|
||||
@@ -1682,7 +1682,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
|
||||
return 1;
|
||||
}
|
||||
|
||||
pol->curlft.use_time = (unsigned long)xtime.tv_sec;
|
||||
pol->curlft.use_time = get_seconds();
|
||||
|
||||
pols[0] = pol;
|
||||
npols ++;
|
||||
@@ -1694,7 +1694,7 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb,
|
||||
if (pols[1]) {
|
||||
if (IS_ERR(pols[1]))
|
||||
return 0;
|
||||
pols[1]->curlft.use_time = (unsigned long)xtime.tv_sec;
|
||||
pols[1]->curlft.use_time = get_seconds();
|
||||
npols ++;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user