[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <lsq.1479082460.713704932@decadent.org.uk>
Date: Mon, 14 Nov 2016 00:14:20 +0000
From: Ben Hutchings <ben@...adent.org.uk>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
CC: akpm@...ux-foundation.org,
"Haishuang Yan" <yanhaishuang@...s.chinamobile.com>,
"David S. Miller" <davem@...emloft.net>
Subject: [PATCH 3.16 319/346] ip6_gre: Set flowi6_proto as IPPROTO_GRE in
xmit path.
3.16.39-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Haishuang Yan <yanhaishuang@...s.chinamobile.com>
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@...s.chinamobile.com>
Signed-off-by: David S. Miller <davem@...emloft.net>
Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
---
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;
Powered by blists - more mailing lists