This is a note to let you know that I've just added the patch titled
[PATCH 05/41] vti6: return GRE_KEY for vti6
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
vti6-return-gre_key-for-vti6.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e4ced4db0033765f80162bbd83c330052dfdad01 Mon Sep 17 00:00:00 2001
From: David Forster <dforster@xxxxxxxxxxx>
Date: Fri, 24 Feb 2017 14:20:32 +0000
Subject: [PATCH 05/41] vti6: return GRE_KEY for vti6
From: David Forster <dforster@xxxxxxxxxxx>
[ 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@xxxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/ipv6/ip6_vti.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -680,6 +680,10 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *
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));
Patches currently in stable-queue which might be from dforster@xxxxxxxxxxx are
queue-4.4/vti6-return-gre_key-for-vti6.patch