From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 13 Dec 2007 13:24:40 +0000 (-0800)
Subject: [DECNET]: Fix inverted wait flag in xfrm_lookup call
X-Git-Tag: v2.6.25-rc1~1162^2~1112
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=96eba69dbac767f4e287df39e6fa489d37f1aa7b;p=karo-tx-linux.git

[DECNET]: Fix inverted wait flag in xfrm_lookup call

My previous patch made the wait flag take the opposite value to what
it should be.  This patch fixes that.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index 73a13075b7ee..b712d0b36526 100644
--- a/net/decnet/dn_route.c
+++ b/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;
 }