From fbfd037635b350e3d84775719b8407d8b18905eb Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Sun, 30 Dec 2007 21:09:38 -0800
Subject: [PATCH] --- yaml --- r: 78635 b: refs/heads/master c:
 fcb8c156c8277ee9d71c8c81587d494c9c5240b3 h: refs/heads/master i:   78633:
 e3a3bb1296eed799a50648c391be64cdc97b4ba5   78631:
 3ef38b3c0c56fda2ed7c0760bc664b6c21786c1f v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_output.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b07a3a9a6b94..93ab62c0c486 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15ca36fb994923b454df44e5d7aa14b84ce5aee4
+refs/heads/master: fcb8c156c8277ee9d71c8c81587d494c9c5240b3
diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c
index c1ba63efd7cb..81ad8eb2b283 100644
--- a/trunk/net/xfrm/xfrm_output.c
+++ b/trunk/net/xfrm/xfrm_output.c
@@ -78,6 +78,8 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
 		spin_unlock_bh(&x->lock);
 
 		err = x->type->output(x, skb);
+		if (err == -EINPROGRESS)
+			goto out_exit;
 
 resume:
 		if (err) {