projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9267135
)
ipv6: use lwtunnel_output6() only if flag redirect is set
author
Nicolas Dichtel
<
[email protected]
>
Fri, 24 Jul 2015 08:59:41 +0000
(10:59 +0200)
committer
David S. Miller
<
[email protected]
>
Mon, 27 Jul 2015 08:00:51 +0000
(
01:00
-0700)
This function make sense only when LWTUNNEL_STATE_OUTPUT_REDIRECT is set.
The check is already done in IPv4.
CC: Thomas Graf <
[email protected]
>
CC: Roopa Prabhu <
[email protected]
>
Fixes: 74a0f2fe8ed5 ("ipv6: rt6_info output redirect to tunnel output")
Signed-off-by: Nicolas Dichtel <
[email protected]
>
Acked-by: Thomas Graf <
[email protected]
>
Acked-by: Roopa Prabhu <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/ipv6/route.c
patch
|
blob
|
history
diff --git
a/net/ipv6/route.c
b/net/ipv6/route.c
index 7f2214f8fde7176ab655f0a5e337b03103e3c8ce..f91d2637072bf7889bdc65f8a6616450998aba04 100644
(file)
--- 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);