3.16.39-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Haishuang Yan <[email protected]> commit 252f3f5a1189a7f6c309d8e4ff1c4c1888a27f13 upstream. In gre6 xmit path, we are sending a GRE packet, so set fl6 proto to IPPROTO_GRE properly. Signed-off-by: Haishuang Yan <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- net/ipv6/ip6_gre.c | 1 + 1 file changed, 1 insertion(+) --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -939,6 +939,7 @@ static void ip6gre_tnl_link_config(struc fl6->daddr = p->raddr; fl6->flowi6_oif = p->link; fl6->flowlabel = 0; + fl6->flowi6_proto = IPPROTO_GRE; if (!(p->flags&IP6_TNL_F_USE_ORIG_TCLASS)) fl6->flowlabel |= IPV6_TCLASS_MASK & p->flowinfo;
