From aad64ca2e88b714f525b68f3e0ae5f44a8b0ca02 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 4 Dec 2006 19:59:00 -0800
Subject: [PATCH] --- yaml --- r: 43150 b: refs/heads/master c:
 1b6651f1bf2453d593478aa88af267f057fd73e2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ce450fb5c4c3..a20be1fb54c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 170b828a31bbeaee3a80a05acefe3596e38f09e0
+refs/heads/master: 1b6651f1bf2453d593478aa88af267f057fd73e2
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 9f3924c4905e..11c167118e87 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -1780,7 +1780,7 @@ static inline int __mkroute_input(struct sk_buff *skb,
 #endif
 	if (in_dev->cnf.no_policy)
 		rth->u.dst.flags |= DST_NOPOLICY;
-	if (in_dev->cnf.no_xfrm)
+	if (out_dev->cnf.no_xfrm)
 		rth->u.dst.flags |= DST_NOXFRM;
 	rth->fl.fl4_dst	= daddr;
 	rth->rt_dst	= daddr;