| Message ID | 20180711101941.4039411-2-arnd@arndb.de |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2,RESEND,net-next] xfrm: use time64_t for in-kernel timestamps | expand |
On Wed, Jul 11, 2018 at 12:19:14PM +0200, Arnd Bergmann wrote: > get_seconds() is deprecated because it can overflow on 32-bit > architectures. For the xfrm_state->lastused member, we treat the data > as a 64-bit number already, so we just need to use the right accessor > that works on both 32-bit and 64-bit machines. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Also applied to ipsec-next, thanks!
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 51cc475b87e0..d704b662a94b 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -227,7 +227,7 @@ struct xfrm_state { long saved_tmo; /* Last used time */ - unsigned long lastused; + time64_t lastused; struct page_frag xfrag; diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c index 07d36573f50b..da28e4407b8f 100644 --- a/net/ipv6/xfrm6_mode_ro.c +++ b/net/ipv6/xfrm6_mode_ro.c @@ -55,7 +55,7 @@ static int xfrm6_ro_output(struct xfrm_state *x, struct sk_buff *skb) __skb_pull(skb, hdr_len); memmove(ipv6_hdr(skb), iph, hdr_len); - x->lastused = get_seconds(); + x->lastused = ktime_get_real_seconds(); return 0; }
get_seconds() is deprecated because it can overflow on 32-bit architectures. For the xfrm_state->lastused member, we treat the data as a 64-bit number already, so we just need to use the right accessor that works on both 32-bit and 64-bit machines. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- include/net/xfrm.h | 2 +- net/ipv6/xfrm6_mode_ro.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.0