diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-01-15 03:34:50 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-01-15 03:34:50 +0100 |
| commit | 1d9f03c0a15fa01aa14fb295cbc1236403fceb0b (patch) | |
| tree | 2161a4e17f383a14e1e235e2deed7142733aca9b /net/ipv6/sit.c | |
| parent | Merge branch 'dissect-ptp-l2-packet-header' (diff) | |
| parent | Merge tag 'linux-kselftest-fixes-5.11-rc4' of git://git.kernel.org/pub/scm/li... (diff) | |
| download | linux-1d9f03c0a15fa01aa14fb295cbc1236403fceb0b.tar.xz linux-1d9f03c0a15fa01aa14fb295cbc1236403fceb0b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 2da0ee703779..93636867aee2 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1645,8 +1645,11 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev, } #ifdef CONFIG_IPV6_SIT_6RD - if (ipip6_netlink_6rd_parms(data, &ip6rd)) + if (ipip6_netlink_6rd_parms(data, &ip6rd)) { err = ipip6_tunnel_update_6rd(nt, &ip6rd); + if (err < 0) + unregister_netdevice_queue(dev, NULL); + } #endif return err; |