From 230416aabe6253488dceb3ac5d7dccac7a39deba Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Tue, 8 Nov 2011 12:12:44 +0000
Subject: [PATCH] --- yaml --- r: 275665 b: refs/heads/master c:
 069294e813ed5f27f82613b027609bcda5f1b914 h: refs/heads/master i:   275663:
 0e978dca4caf2ffc27a7a17c4084447e81aa2a47 v: v3

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

diff --git a/[refs] b/[refs]
index 562c5a168fd1..08adfbe6ff1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fecc73519439361eab21fb3cebec504672ef0e03
+refs/heads/master: 069294e813ed5f27f82613b027609bcda5f1b914
diff --git a/trunk/net/ipv4/ah4.c b/trunk/net/ipv4/ah4.c
index c1f4154552fc..33ca18603e3b 100644
--- a/trunk/net/ipv4/ah4.c
+++ b/trunk/net/ipv4/ah4.c
@@ -136,8 +136,6 @@ static void ah_output_done(struct crypto_async_request *base, int err)
 		memcpy(top_iph+1, iph+1, top_iph->ihl*4 - sizeof(struct iphdr));
 	}
 
-	err = ah->nexthdr;
-
 	kfree(AH_SKB_CB(skb)->tmp);
 	xfrm_output_resume(skb, err);
 }
diff --git a/trunk/net/ipv6/ah6.c b/trunk/net/ipv6/ah6.c
index 2195ae651923..ede4d9d6cc2b 100644
--- a/trunk/net/ipv6/ah6.c
+++ b/trunk/net/ipv6/ah6.c
@@ -324,8 +324,6 @@ static void ah6_output_done(struct crypto_async_request *base, int err)
 #endif
 	}
 
-	err = ah->nexthdr;
-
 	kfree(AH_SKB_CB(skb)->tmp);
 	xfrm_output_resume(skb, err);
 }