From: David Forster <dforster@brocade.com>
Date: Fri, 24 Feb 2017 14:20:32 +0000 (+0000)
Subject: vti6: return GRE_KEY for vti6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7dcdf941cdc96692ab99fd790c8cc68945514851;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

vti6: return GRE_KEY for vti6

Align vti6 with vti by returning GRE_KEY flag. This enables iproute2
to display tunnel keys on "ip -6 tunnel show"

Signed-off-by: David Forster <dforster@brocade.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index c795fee372c4..644ba59fbd9d 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -693,6 +693,10 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p)
 	u->link = p->link;
 	u->i_key = p->i_key;
 	u->o_key = p->o_key;
+	if (u->i_key)
+		u->i_flags |= GRE_KEY;
+	if (u->o_key)
+		u->o_flags |= GRE_KEY;
 	u->proto = p->proto;
 
 	memcpy(u->name, p->name, sizeof(u->name));