---

yaml --- r: 275687 b: refs/heads/master c: 4b90a60 h: refs/heads/master i: 275685: e4af6da 275683: 390ebb0 275679: 0d278db v: v3
git-mirror · Nov 12, 2011 · a054748 · a054748
1 parent 687a0b3
commit a054748
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: 1e49570171117e547e6324c58371db4a0dc2f1db
+refs/heads/master: 4b90a603a1b21d63cf743cc833680cb195a729f6
diff --git a/trunk/net/ipv4/ah4.c b/trunk/net/ipv4/ah4.c
@@ -369,8 +369,6 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
 		if (err == -EINPROGRESS)
 			goto out;
 
-		if (err == -EBUSY)
-			err = NET_XMIT_DROP;
 		goto out_free;
 	}
 

diff --git a/trunk/net/ipv6/ah6.c b/trunk/net/ipv6/ah6.c
@@ -581,8 +581,6 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
 		if (err == -EINPROGRESS)
 			goto out;
 
-		if (err == -EBUSY)
-			err = NET_XMIT_DROP;
 		goto out_free;
 	}