Skip to content

L
linux
Commit 33e9809b authored by Michal Ludvig's avatar Michal Ludvig Committed by David S. Miller
Browse files
Options

[IPV6]: Set flow protocol correctly in SIT driver route lookups.

parent cbf2dc09
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
net/ipv6/sit.c
View file @ 33e9809b
...@@ -485,7 +485,8 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -485,7 +485,8 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
{ .daddr = dst, { .daddr = dst,
.saddr = tiph->saddr, .saddr = tiph->saddr,
.tos = RT_TOS(tos) } }, .tos = RT_TOS(tos) } },
.oif = tunnel->parms.link }; .oif = tunnel->parms.link,
.proto = IPPROTO_IPV6 };
if (ip_route_output_key(&rt, &fl)) { if (ip_route_output_key(&rt, &fl)) {
tunnel->stat.tx_carrier_errors++; tunnel->stat.tx_carrier_errors++;
goto tx_error_icmp; goto tx_error_icmp;
...@@ -757,7 +758,8 @@ static int ipip6_tunnel_init(struct net_device *dev) ...@@ -757,7 +758,8 @@ static int ipip6_tunnel_init(struct net_device *dev)
{ .daddr = iph->daddr, { .daddr = iph->daddr,
.saddr = iph->saddr, .saddr = iph->saddr,
.tos = RT_TOS(iph->tos) } }, .tos = RT_TOS(iph->tos) } },
.oif = tunnel->parms.link }; .oif = tunnel->parms.link,
.proto = IPPROTO_IPV6 };
struct rtable *rt; struct rtable *rt;
if (!ip_route_output_key(&rt, &fl)) { if (!ip_route_output_key(&rt, &fl)) {
tdev = rt->u.dst.dev; tdev = rt->u.dst.dev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7