diff options
| author | David Forster <dforster@brocade.com> | 2017-02-24 14:20:32 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-22 12:43:31 +0100 |
| commit | f7081057d12c0cb50a84869bae03fb9d406037f0 (patch) | |
| tree | b133133facc737a09894d8ce220368268ec50bb2 /net | |
| parent | ee2da79de289d062c9c3a5714b3f4d37fa6c868f (diff) | |
| download | linux-stable-f7081057d12c0cb50a84869bae03fb9d406037f0.tar.gz linux-stable-f7081057d12c0cb50a84869bae03fb9d406037f0.tar.bz2 linux-stable-f7081057d12c0cb50a84869bae03fb9d406037f0.zip | |
vti6: return GRE_KEY for vti6
[ Upstream commit 7dcdf941cdc96692ab99fd790c8cc68945514851 ]
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 c299c1e2bbf0..66c2b4b41793 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -691,6 +691,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)); |