adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IPSEC]: Make x->lastused an unsigned long

Browse source 
Currently x->lastused is u64 which means that it cannot be
read/written atomically on all architectures.  David Miller observed
that the value stored in it is only an unsigned long which is always
atomic.

So based on his suggestion this patch changes the internal
representation from u64 to unsigned long while the user-interface
still refers to it as u64.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2007-11-13 21:47:08 -08:00 committed by David S. Miller
parent 0ebea8ef35
commit d26f398400
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/xfrm.h
View file

@ -183,7 +183,7 @@ struct xfrm_state
struct timer_list timer; struct timer_list timer;
/* Last used time */ /* Last used time */
u64 lastused; unsigned long lastused;
/* Reference to data common to all the instances of this /* Reference to data common to all the instances of this
* transformer. */ * transformer. */

2
net/ipv6/xfrm6_mode_ro.c
View file

@ -54,9 +54,7 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb)
__skb_pull(skb, hdr_len); __skb_pull(skb, hdr_len);
memmove(ipv6_hdr(skb), iph, hdr_len); memmove(ipv6_hdr(skb), iph, hdr_len);
spin_lock_bh(&x->lock);
x->lastused = get_seconds(); x->lastused = get_seconds();
spin_unlock_bh(&x->lock);
return 0; return 0;
} }

4
net/xfrm/xfrm_user.c
View file

@ -1986,8 +1986,8 @@ static inline size_t xfrm_sa_len(struct xfrm_state *x)
if (x->coaddr) if (x->coaddr)
l += nla_total_size(sizeof(*x->coaddr)); l += nla_total_size(sizeof(*x->coaddr));
/* Must count this as this may become non-zero behind our back. */ /* Must count x->lastused as it may become non-zero behind our back. */
l += nla_total_size(sizeof(x->lastused)); l += nla_total_size(sizeof(u64));
return l; return l;
} }