From 861ee01adc9f808a1c36c39c674ddd126bb12929 Mon Sep 17 00:00:00 2001 From: "fernando@oss.ntt.co" Date: Thu, 23 Oct 2008 04:27:19 +0000 Subject: [PATCH] --- yaml --- r: 118343 b: refs/heads/master c: a432226614c5616e3cfd211e0acffa0acfb4770c h: refs/heads/master i: 118341: 126a1ff7d62021d43c5c73c824ceb23dd59b7abc 118339: baf6e296e99b19537b0a8625b076c6eaeb6b1f79 118335: 85c382dca0c1b1acbdd129c84902ed10a3e16e81 v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_policy.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a0a93f28c127..54766430455d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a8af722495469e9c550386b910c5b93c91cf107 +refs/heads/master: a432226614c5616e3cfd211e0acffa0acfb4770c diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c index 832b47c1de80..25872747762c 100644 --- a/trunk/net/xfrm/xfrm_policy.c +++ b/trunk/net/xfrm/xfrm_policy.c @@ -1251,6 +1251,8 @@ xfrm_tmpl_resolve_one(struct xfrm_policy *policy, struct flowi *fl, -EINVAL : -EAGAIN); xfrm_state_put(x); } + else if (error == -ESRCH) + error = -EAGAIN; if (!tmpl->optional) goto fail;