From 941fa78e93d1547db196c2fc329761038082bf40 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 13 Dec 2007 05:24:40 -0800
Subject: [PATCH] --- yaml --- r: 78436 b: refs/heads/master c:
 96eba69dbac767f4e287df39e6fa489d37f1aa7b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/decnet/dn_route.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ae5b0da64c02..454df132c62b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a66207121f85c54a3df4d347a3c5bdf6cb154b09
+refs/heads/master: 96eba69dbac767f4e287df39e6fa489d37f1aa7b
diff --git a/trunk/net/decnet/dn_route.c b/trunk/net/decnet/dn_route.c
index 73a13075b7ee..b712d0b36526 100644
--- a/trunk/net/decnet/dn_route.c
+++ b/trunk/net/decnet/dn_route.c
@@ -1197,7 +1197,7 @@ int dn_route_output_sock(struct dst_entry **pprt, struct flowi *fl, struct sock
 	err = __dn_route_output_key(pprt, fl, flags & MSG_TRYHARD);
 	if (err == 0 && fl->proto) {
 		err = xfrm_lookup(pprt, fl, sk, (flags & MSG_DONTWAIT) ?
-						XFRM_LOOKUP_WAIT : 0);
+						0 : XFRM_LOOKUP_WAIT);
 	}
 	return err;
 }