diff options
| author | David Forster <dforster@brocade.com> | 2017-02-24 14:20:32 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-04-18 07:55:51 +0200 |
| commit | 629d9888cc0996cc012d8666e8250f5878cdd02b (patch) | |
| tree | 2dee2cdf0257e104a2c855d0b4d185e19f9e5ba3 /net | |
| parent | 710b3205d2631e8ba40a6df07dad4c5a3e5cbfb2 (diff) | |
vti6: return GRE_KEY for vti6
commit 7dcdf941cdc96692ab99fd790c8cc68945514851 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_vti.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index 1d67b37592d1..591e2355cc9e 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -645,6 +645,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)); |