From 0ffd5fc82703d8e876a5205092d1476b097288a9 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 17 Oct 2007 21:30:07 -0700
Subject: [PATCH] --- yaml --- r: 71286 b: refs/heads/master c:
 7aa68cb90638ccc36559a936814e4c089892b3d9 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/ipv6/ah6.c         | 2 ++
 trunk/net/ipv6/xfrm6_input.c | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e49107be4926..0dbee3d93274 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33b5ecb8f64706d1ed472dcb44162ab3a7345724
+refs/heads/master: 7aa68cb90638ccc36559a936814e4c089892b3d9
diff --git a/trunk/net/ipv6/ah6.c b/trunk/net/ipv6/ah6.c
index f9f689162692..a8221d1da0ff 100644
--- a/trunk/net/ipv6/ah6.c
+++ b/trunk/net/ipv6/ah6.c
@@ -344,6 +344,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
 	    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
 		goto out;
 
+	skb->ip_summed = CHECKSUM_NONE;
+
 	hdr_len = skb->data - skb_network_header(skb);
 	ah = (struct ip_auth_hdr *)skb->data;
 	ahp = x->data;
diff --git a/trunk/net/ipv6/xfrm6_input.c b/trunk/net/ipv6/xfrm6_input.c
index 596a730294ec..b1201c33eb12 100644
--- a/trunk/net/ipv6/xfrm6_input.c
+++ b/trunk/net/ipv6/xfrm6_input.c
@@ -97,7 +97,6 @@ int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
 	memcpy(skb->sp->xvec + skb->sp->len, xfrm_vec,
 	       xfrm_nr * sizeof(xfrm_vec[0]));
 	skb->sp->len += xfrm_nr;
-	skb->ip_summed = CHECKSUM_NONE;
 
 	nf_reset(skb);