---

yaml --- r: 275665 b: refs/heads/master c: 069294e h: refs/heads/master i: 275663: 0e978dc v: v3
git-mirror · Nov 9, 2011 · 230416a · 230416a
1 parent b9ce6d2
commit 230416a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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
@@ -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);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     #endif
     	}
-    	err = ah->nexthdr;
     	kfree(AH_SKB_CB(skb)->tmp);
     	xfrm_output_resume(skb, err);
     }
@@ Expand Down @@