diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2015-12-03 19:21:50 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-05 19:55:53 +0300 |
| commit | 9c8e952013d63e1e33510f59f3e334720838d6e8 (patch) | |
| tree | 9a6912b6337c75978825cdf5e722afefaaacd54b /net | |
| parent | 722c8c2146fdfea39770c177cf2449186b0795dd (diff) | |
| download | linux-9c8e952013d63e1e33510f59f3e334720838d6e8.tar.xz | |
gre6: allow to update all parameters via rtnl
[ Upstream commit 6a61d4dbf4f54b5683e0f1e58d873cecca7cb977 ]
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 <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index b2e4c77d9a8c..f719c51369fc 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -1546,13 +1546,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; } |