Commit 28a058fe authored by Ville Nuorvala's avatar Ville Nuorvala Committed by Linus Torvalds

[IPV6]: In ip6ip6 tunnel, user provides flowlabel in network byte order.

parent b8ee15c9
...@@ -810,9 +810,9 @@ static void ip6ip6_tnl_link_config(struct ip6_tnl *t) ...@@ -810,9 +810,9 @@ static void ip6ip6_tnl_link_config(struct ip6_tnl *t)
fl->fl6_flowlabel = 0; fl->fl6_flowlabel = 0;
if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS)) if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS))
fl->fl6_flowlabel |= IPV6_TCLASS_MASK & htonl(p->flowinfo); fl->fl6_flowlabel |= IPV6_TCLASS_MASK & p->flowinfo;
if (!(p->flags&IP6_TNL_F_USE_ORIG_FLOWLABEL)) if (!(p->flags&IP6_TNL_F_USE_ORIG_FLOWLABEL))
fl->fl6_flowlabel |= IPV6_FLOWLABEL_MASK & htonl(p->flowinfo); fl->fl6_flowlabel |= IPV6_FLOWLABEL_MASK & p->flowinfo;
ip6_tnl_set_cap(t); ip6_tnl_set_cap(t);
......
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