3 files changed, 3 insertions, 5 deletions

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 329de412c0ba..311bbd113aa7 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -183,7 +183,7 @@ struct xfrm_state
         struct timer_list       timer;
 
         /* Last used time */
-        u64                     lastused;
+        unsigned long           lastused;
 
         /* Reference to data common to all the instances of this
          * transformer. */
diff --git a/net/ipv6/xfrm6_mode_ro.c b/net/ipv6/xfrm6_mode_ro.c
index 4a01cb3c370b..63d5d493098a 100644
--- a/net/ipv6/xfrm6_mode_ro.c
+++ b/net/ipv6/xfrm6_mode_ro.c
@@ -54,9 +54,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);
 
-        spin_lock_bh(&x->lock);
         x->lastused = get_seconds();
-        spin_unlock_bh(&x->lock);
 
         return 0;
 }
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index c4f6419b1769..6424e5360511 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1986,8 +1986,8 @@ static inline size_t xfrm_sa_len(struct xfrm_state *x)
         if (x->coaddr)
                 l += nla_total_size(sizeof(*x->coaddr));
 
-        /* Must count this as this may become non-zero behind our back. */
-        l += nla_total_size(sizeof(x->lastused));
+        /* Must count x->lastused as it may become non-zero behind our back. */
+        l += nla_total_size(sizeof(u64));
 
         return l;
 }