diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-12-16 16:13:19 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-12-16 16:13:19 -0800 |
| commit | 7cd2802d7496c1fc76f42dc045b48cc16d11df39 (patch) | |
| tree | 41c33f5944bbc686a489801762eb126e07049b81 /net/ipv6 | |
| parent | 0f473bb6ed2d0b8533a079ee133f625f83de5315 (diff) | |
| parent | 6441998e2e37131b0a4c310af9156d79d3351c16 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/sit.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 057c0f83c800..a618dce7e0bc 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1933,7 +1933,6 @@ static int __net_init sit_init_net(struct net *net) return 0; err_reg_dev: - ipip6_dev_free(sitn->fb_tunnel_dev); free_netdev(sitn->fb_tunnel_dev); err_alloc_dev: return err; |