From a50e7747a23b8145d6bcc50d8045745745a852e5 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 13 Nov 2007 21:47:08 -0800
Subject: [PATCH] --- yaml --- r: 78111 b: refs/heads/master c:
 d26f398400311982d2433debae85746c348b7d58 h: refs/heads/master i:   78109:
 cd793ba78b037e51c9129e9bfa7a474fd63a3e8e   78107:
 09914be2b57a4fca1d22de5e2d2a263d31df4fe8   78103:
 50c848c6fc344d5b66007b42fedf9bcbcc7bc3dd   78095:
 02301bed9ffd60e47c8d58ff9d46c1971ff38d89   78079:
 c5974ca409757d3f69e6c5b1e44339f4b93d2169 v: v3

---
 [refs]                         | 2 +-
 trunk/include/net/xfrm.h       | 2 +-
 trunk/net/ipv6/xfrm6_mode_ro.c | 2 --
 trunk/net/xfrm/xfrm_user.c     | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d825a7f8f601..1d6f6e0d17ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ebea8ef3559b545c37b016f44e84c3b33e47c39
+refs/heads/master: d26f398400311982d2433debae85746c348b7d58
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
index 329de412c0ba..311bbd113aa7 100644
--- a/trunk/include/net/xfrm.h
+++ b/trunk/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/trunk/net/ipv6/xfrm6_mode_ro.c b/trunk/net/ipv6/xfrm6_mode_ro.c
index 4a01cb3c370b..63d5d493098a 100644
--- a/trunk/net/ipv6/xfrm6_mode_ro.c
+++ b/trunk/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/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c
index c4f6419b1769..6424e5360511 100644
--- a/trunk/net/xfrm/xfrm_user.c
+++ b/trunk/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;
 }