diff options
| author | David Forster <dforster@brocade.com> | 2017-02-24 15:20:32 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-24 17:42:55 +0100 |
| commit | 7dcdf941cdc96692ab99fd790c8cc68945514851 (patch) | |
| tree | 09a652ac0c88a36fe9ab3e9c554dd67f244c6851 /net/ipv6 | |
| parent | rxrpc: Fix an assertion in rxrpc_read() (diff) | |
| download | linux-7dcdf941cdc96692ab99fd790c8cc68945514851.tar.xz linux-7dcdf941cdc96692ab99fd790c8cc68945514851.zip | |
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>
Diffstat (limited to 'net/ipv6')
| -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 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)); |