Commit 10dab580 authored by Haishuang Yan's avatar Haishuang Yan Committed by Ben Hutchings

ip6_gre: Set flowi6_proto as IPPROTO_GRE in xmit path.

commit 252f3f5a upstream.

In gre6 xmit path, we are sending a GRE packet, so set fl6 proto
to IPPROTO_GRE properly.
Signed-off-by: default avatarHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 1ae83f8c
...@@ -939,6 +939,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu) ...@@ -939,6 +939,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu)
fl6->daddr = p->raddr; fl6->daddr = p->raddr;
fl6->flowi6_oif = p->link; fl6->flowi6_oif = p->link;
fl6->flowlabel = 0; fl6->flowlabel = 0;
fl6->flowi6_proto = IPPROTO_GRE;
if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS)) if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS))
fl6->flowlabel |= IPV6_TCLASS_MASK & p->flowinfo; fl6->flowlabel |= IPV6_TCLASS_MASK & p->flowinfo;
......
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