[net] ip6_gre: update version related info when changing link

Message ID 20190110031742.10834-1-liuhangbin@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series
  • [net] ip6_gre: update version related info when changing link
Related show

Commit Message

Hangbin Liu Jan. 10, 2019, 3:17 a.m.
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>
---
 net/ipv6/ip6_gre.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

David Miller Jan. 15, 2019, 9:46 p.m. | #1
From: Hangbin Liu <liuhangbin@gmail.com>
Date: Thu, 10 Jan 2019 11:17:42 +0800

> 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>

Applied and queued up for -stable.

Patch

diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 09d0826742f8..5ca0dbc077df 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -1169,6 +1169,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);
 }