projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b227e5)
ip6_gre: Set flowi6_proto as IPPROTO_GRE in xmit path.
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Sat, 21 May 2016 10:17:35 +0000 (18:17 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 May 2016 21:33:48 +0000 (14:33 -0700)
In gre6 xmit path, we are sending a GRE packet, so set fl6 proto
to IPPROTO_GRE properly.

Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_gre.c patch | blob | blame | history

diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index a6fe3397728cc8ae23ca56eed367120f64da357c..f4ac2842d4d9543d2ac1e7d4b91b99df32d43e6d 100644 (file)
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -712,6 +712,7 @@ static void ip6gre_tnl_link_config(struct ip6_tnl *t, int set_mtu)
        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;