ipv6: use lwtunnel_output6() only if flag redirect is set

NicolasDichtel · davem330 · commit 6673a9f4e35c · 2015-07-27T01:00:51.000-07:00
This function make sense only when LWTUNNEL_STATE_OUTPUT_REDIRECT is set. The check is already done in IPv4. CC: Thomas Graf <tgraf@suug.ch> CC: Roopa Prabhu <roopa@cumulusnetworks.com> Fixes: 74a0f2f ("ipv6: rt6_info output redirect to tunnel output") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Thomas Graf <tgraf@suug.ch> Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
@@ -1780,7 +1780,8 @@ int ip6_route_add(struct fib6_config *cfg)
 			goto out;
 		lwtunnel_state_get(lwtstate);
 		rt->rt6i_lwtstate = lwtstate;
-		rt->dst.output = lwtunnel_output6;
+		if (lwtunnel_output_redirect(rt->rt6i_lwtstate))
+			rt->dst.output = lwtunnel_output6;
 	}
 
 	ipv6_addr_prefix(&rt->rt6i_dst.addr, &cfg->fc_dst, cfg->fc_dst_len);

Original file line number	Diff line number	Diff line change
`@@ -1780,7 +1780,8 @@ int ip6_route_add(struct fib6_config *cfg)`
`1780`	`1780`	`goto out;`
`1781`	`1781`	`lwtunnel_state_get(lwtstate);`
`1782`	`1782`	`rt->rt6i_lwtstate = lwtstate;`
`1783`		`- rt->dst.output = lwtunnel_output6;`
	`1783`	`+ if (lwtunnel_output_redirect(rt->rt6i_lwtstate))`
	`1784`	`+ rt->dst.output = lwtunnel_output6;`
`1784`	`1785`	`}`
`1785`	`1786`
`1786`	`1787`	`ipv6_addr_prefix(&rt->rt6i_dst.addr, &cfg->fc_dst, cfg->fc_dst_len);`