-stable review patch. If anyone has any objections, please let us know. ------------------ From: Patrick McHardy Currently the behaviour of disable_xfrm is inconsistent between locally generated and forwarded packets. For locally generated packets disable_xfrm disables the policy lookup if it is set on the output device, for forwarded traffic however it looks at the input device. This makes it impossible to disable xfrm on all devices but a dummy device and use normal routing to direct traffic to that device. Always use the output device when checking disable_xfrm. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller Signed-off-by: Chris Wright --- commit 9be2b4e36fb04bbc968693ef95a75acc17cf2931 Author: Patrick McHardy Date: Mon Dec 4 19:59:00 2006 -0800 net/ipv4/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-2.6.19.orig/net/ipv4/route.c +++ linux-2.6.19/net/ipv4/route.c @@ -1784,7 +1784,7 @@ static inline int __mkroute_input(struct #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; -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/