diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2016-05-21 18:17:35 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:17:35 +0000 |
| commit | 10dab580b61b1a5fee28a67657029b557f165dcf (patch) | |
| tree | 5710f726acff3fa584f1e5c1d2cec3b1e1b0f373 | |
| parent | 1ae83f8c0d2714a1f934ecb656fd5ff6a4a486c1 (diff) | |
| download | lwn-10dab580b61b1a5fee28a67657029b557f165dcf.tar.gz lwn-10dab580b61b1a5fee28a67657029b557f165dcf.zip | |
ip6_gre: Set flowi6_proto as IPPROTO_GRE in xmit path.
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 <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/ipv6/ip6_gre.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 1ee013644bb2..6df94c1053cb 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -939,6 +939,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; |