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

tgraf · davem330 · commit 11b3d9c5869b · 2016-12-02T10:51:49.000-05:00
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: 2536862 ("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
@@ -2155,8 +2155,10 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
 	}
 
 	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;
 }

Original file line number	Diff line number	Diff line change
`@@ -2155,8 +2155,10 @@ static struct rtable __mkroute_output(const struct fib_result res,`
`2155`	`2155`	`}`
`2156`	`2156`
`2157`	`2157`	`rt_set_nexthop(rth, fl4->daddr, res, fnhe, fi, type, 0);`
`2158`		`- if (lwtunnel_output_redirect(rth->dst.lwtstate))`
	`2158`	`+ if (lwtunnel_output_redirect(rth->dst.lwtstate)) {`
	`2159`	`+ rth->dst.lwtstate->orig_output = rth->dst.output;`
`2159`	`2160`	`rth->dst.output = lwtunnel_output;`
	`2161`	`+ }`
`2160`	`2162`
`2161`	`2163`	`return rth;`
`2162`	`2164`	`}`