* [PATCH] vti6: return GRE_KEY for vti6
@ 2017-02-24 14:20 David Forster
2017-02-24 16:38 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: David Forster @ 2017-02-24 14:20 UTC (permalink / raw)
To: netdev
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>
---
net/ipv6/ip6_vti.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index c795fee..644ba59 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));
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] vti6: return GRE_KEY for vti6
2017-02-24 14:20 [PATCH] vti6: return GRE_KEY for vti6 David Forster
@ 2017-02-24 16:38 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-02-24 16:38 UTC (permalink / raw)
To: dforster; +Cc: netdev
From: David Forster <dforster@brocade.com>
Date: Fri, 24 Feb 2017 14:20:32 +0000
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-24 16:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-24 14:20 [PATCH] vti6: return GRE_KEY for vti6 David Forster
2017-02-24 16:38 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).