---

yaml --- r: 78406 b: refs/heads/master c: 815f4e5 h: refs/heads/master v: v3
git-mirror · Jan 28, 2008 · 19e4133 · 19e4133
1 parent d162f90
commit 19e4133
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f71c81ac37b27b824e9ce18fe17438dc2af4a16
+refs/heads/master: 815f4e57e9fc67456624ecde0515a901368c78d2
diff --git a/trunk/include/net/dst.h b/trunk/include/net/dst.h
@@ -265,6 +265,11 @@ static inline struct dst_entry *dst_check(struct dst_entry *dst, u32 cookie)
 
 extern void		dst_init(void);
 
+/* Flags for xfrm_lookup flags argument. */
+enum {
+	XFRM_LOOKUP_WAIT = 1 << 0,
+};
+
 struct flowi;
 #ifndef CONFIG_XFRM
 static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,

diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
@@ -1565,7 +1565,7 @@ int __xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,
 				xfrm_pol_put(policy);
 				return -EREMOTE;
 			}
-			if (err == -EAGAIN && flags) {
+			if (err == -EAGAIN && (flags & XFRM_LOOKUP_WAIT)) {
 				DECLARE_WAITQUEUE(wait, current);
 
 				add_wait_queue(&km_waitq, &wait);