From e99d0af20720dbc26be50dbcb96163ab51257642 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Tue, 8 Nov 2011 12:12:45 +0000
Subject: [PATCH] --- yaml --- r: 275666 b: refs/heads/master c:
 b7ea81a58adc123a4e980cb0eff9eb5c144b5dc7 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv4/ah4.c | 4 ++--
 trunk/net/ipv6/ah6.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 08adfbe6ff1f..941149af2cfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 069294e813ed5f27f82613b027609bcda5f1b914
+refs/heads/master: b7ea81a58adc123a4e980cb0eff9eb5c144b5dc7
diff --git a/trunk/net/ipv4/ah4.c b/trunk/net/ipv4/ah4.c
index 33ca18603e3b..c7056b2e831f 100644
--- a/trunk/net/ipv4/ah4.c
+++ b/trunk/net/ipv4/ah4.c
@@ -262,12 +262,12 @@ static void ah_input_done(struct crypto_async_request *base, int err)
 	if (err)
 		goto out;
 
+	err = ah->nexthdr;
+
 	skb->network_header += ah_hlen;
 	memcpy(skb_network_header(skb), work_iph, ihl);
 	__skb_pull(skb, ah_hlen + ihl);
 	skb_set_transport_header(skb, -ihl);
-
-	err = ah->nexthdr;
 out:
 	kfree(AH_SKB_CB(skb)->tmp);
 	xfrm_input_resume(skb, err);
diff --git a/trunk/net/ipv6/ah6.c b/trunk/net/ipv6/ah6.c
index ede4d9d6cc2b..7a33aaa00227 100644
--- a/trunk/net/ipv6/ah6.c
+++ b/trunk/net/ipv6/ah6.c
@@ -464,12 +464,12 @@ static void ah6_input_done(struct crypto_async_request *base, int err)
 	if (err)
 		goto out;
 
+	err = ah->nexthdr;
+
 	skb->network_header += ah_hlen;
 	memcpy(skb_network_header(skb), work_iph, hdr_len);
 	__skb_pull(skb, ah_hlen + hdr_len);
 	skb_set_transport_header(skb, -hdr_len);
-
-	err = ah->nexthdr;
 out:
 	kfree(AH_SKB_CB(skb)->tmp);
 	xfrm_input_resume(skb, err);