From: Nicolas Dichtel Date: Thu, 3 Dec 2015 16:21:50 +0000 (+0100) Subject: gre6: allow to update all parameters via rtnl X-Git-Tag: v3.16.35~859 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f19d52a5a919fb7c82b02b803a358825e1fac03;p=thirdparty%2Fkernel%2Fstable.git gre6: allow to update all parameters via rtnl commit 6a61d4dbf4f54b5683e0f1e58d873cecca7cb977 upstream. Parameters were updated only if the kernel was unable to find the tunnel with the new parameters, ie only if core pamareters were updated (keys, addr, link, type). Now it's possible to update ttl, hoplimit, flowinfo and flags. Fixes: c12b395a4664 ("gre: Support GRE over IPv6") Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index f5ea5aaf75f91..1ee013644bb2a 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1553,13 +1553,11 @@ static int ip6gre_changelink(struct net_device *dev, struct nlattr *tb[], return -EEXIST; } else { t = nt; - - ip6gre_tunnel_unlink(ign, t); - ip6gre_tnl_change(t, &p, !tb[IFLA_MTU]); - ip6gre_tunnel_link(ign, t); - netdev_state_change(dev); } + ip6gre_tunnel_unlink(ign, t); + ip6gre_tnl_change(t, &p, !tb[IFLA_MTU]); + ip6gre_tunnel_link(ign, t); return 0; }