From a0547483e3dee05f4ac043aaf79af9b19844f3fc Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Thu, 10 Nov 2011 09:01:27 +0000
Subject: [PATCH] --- yaml --- r: 275687 b: refs/heads/master c:
 4b90a603a1b21d63cf743cc833680cb195a729f6 h: refs/heads/master i:   275685:
 e4af6da84f3cf1a40cdff6884ddf1924db6d2b2a   275683:
 390ebb080cc5fa320e29fbb3e1b34c8ebaed3017   275679:
 0d278dba94b5d78382fdbe568ececf2c01c0a04e 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 656a51787090..98ad00d045ab 100644
--- 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
index c7056b2e831f..36d14406261e 100644
--- 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
index 7a33aaa00227..4c0f894d0843 100644
--- 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;
 	}