summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorHangbin Liu <liuhangbin@gmail.com>2019-01-10 11:17:42 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-31 08:14:33 +0100
commit6c4d069aec0fbbfd2e244b84c014539d1daad988 (patch)
tree35863a9b6cd83d4269ad820c325e09eb85de300d /net/ipv6
parentc9fe9d194d4513d5902a4e79db0092ace010e572 (diff)
downloadlinux-stable-6c4d069aec0fbbfd2e244b84c014539d1daad988.tar.gz
linux-stable-6c4d069aec0fbbfd2e244b84c014539d1daad988.tar.bz2
linux-stable-6c4d069aec0fbbfd2e244b84c014539d1daad988.zip
ip6_gre: update version related info when changing link
[ Upstream commit 80b3671e9377916bf2b02e56113fa7377ce5705a ] We forgot to update ip6erspan version related info when changing link, which will cause setting new hwid failed. Reported-by: Jianlin Shi <jishi@redhat.com> Fixes: 94d7d8f292870 ("ip6_gre: add erspan v2 support") Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/ip6_gre.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 2805d78c9658..345e6839f031 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1187,6 +1187,10 @@ static void ip6gre_tnl_copy_tnl_parm(struct ip6_tnl *t,
t->parms.i_flags = p->i_flags;
t->parms.o_flags = p->o_flags;
t->parms.fwmark = p->fwmark;
+ t->parms.erspan_ver = p->erspan_ver;
+ t->parms.index = p->index;
+ t->parms.dir = p->dir;
+ t->parms.hwid = p->hwid;
dst_cache_reset(&t->dst_cache);
}