OSDN Git Service

vti6: return GRE_KEY for vti6
authorDavid Forster <dforster@brocade.com>
Fri, 24 Feb 2017 14:20:32 +0000 (14:20 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Mar 2017 11:43:31 +0000 (12:43 +0100)
commitf7081057d12c0cb50a84869bae03fb9d406037f0
treeb133133facc737a09894d8ce220368268ec50bb2
parentee2da79de289d062c9c3a5714b3f4d37fa6c868f
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>
net/ipv6/ip6_vti.c