| Message ID | 1437728381-4603-1-git-send-email-nicolas.dichtel@6wind.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 07/24/15 at 10:59am, Nicolas Dichtel wrote: > 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: 74a0f2fe8ed5 ("ipv6: rt6_info output redirect to tunnel output") > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Acked-by: Thomas Graf <tgraf@suug.ch> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 7/24/15, 1:59 AM, Nicolas Dichtel wrote: > 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: 74a0f2fe8ed5 ("ipv6: rt6_info output redirect to tunnel output") > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com> thanks -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Nicolas Dichtel <nicolas.dichtel@6wind.com> Date: Fri, 24 Jul 2015 10:59:41 +0200 > 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: 74a0f2fe8ed5 ("ipv6: rt6_info output redirect to tunnel output") > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f216cb998628..67b2367126f3 100644 --- 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);
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: 74a0f2fe8ed5 ("ipv6: rt6_info output redirect to tunnel output") Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> --- net/ipv6/route.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)