Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dcdf941 authored by David Forster's avatar David Forster Committed by David S. Miller
Browse files

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: default avatarDavid Forster <dforster@brocade.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 774521f3

net/ipv6/ip6_vti.c

+4 −0
Original line number Diff line number Diff line
@@ -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));