From: Thomas Graf <tgraf@suug.ch>
Date: Wed, 30 Nov 2016 16:10:08 +0000 (+0100)
Subject: route: Set orig_output when redirecting to lwt on locally generated traffic
X-Git-Tag: v4.14-rc1~1973^2~131^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11b3d9c5869bc96997cada33be6a56ebd179786b;p=platform%2Fkernel%2Flinux-rpi.git

route: Set orig_output when redirecting to lwt on locally generated traffic

orig_output for IPv4 was only set for dsts which hit an input route.
Set it consistently for locally generated traffic as well to allow
lwt to continue the dst_output() path as configured by the nexthop.

Fixes: 2536862311d ("lwt: Add support to redirect dst.input")
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 6402d74..f098663 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2155,8 +2155,10 @@ add:
 	}
 
 	rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0);
-	if (lwtunnel_output_redirect(rth->dst.lwtstate))
+	if (lwtunnel_output_redirect(rth->dst.lwtstate)) {
+		rth->dst.lwtstate->orig_output = rth->dst.output;
 		rth->dst.output = lwtunnel_output;
+	}
 
 	return rth;
 }