diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-04-17 10:42:54 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-04-17 11:08:07 -0700 |
| commit | 8203c7ce4ef2840929d38b447b4ccd384727f92b (patch) | |
| tree | 07b4079057e035a4063788f120665f5e42967e8e /net/ipv6/sit.c | |
| parent | 474f459360399c5becfd0f189a8894e9e17ad3d3 (diff) | |
| parent | 88a5af943985fb43b4c9472b5abd9c0b9705533d (diff) | |
| download | linux-riscv-8203c7ce4ef2840929d38b447b4ccd384727f92b.tar.gz linux-riscv-8203c7ce4ef2840929d38b447b4ccd384727f92b.tar.bz2 linux-riscv-8203c7ce4ef2840929d38b447b4ccd384727f92b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
- keep the ZC code, drop the code related to reinit
net/bridge/netfilter/ebtables.c
- fix build after move to net_generic
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index ff2ca2e7c7f5..aa98294a3ad3 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -1864,9 +1864,9 @@ static void __net_exit sit_destroy_tunnels(struct net *net, if (dev->rtnl_link_ops == &sit_link_ops) unregister_netdevice_queue(dev, head); - for (prio = 1; prio < 4; prio++) { + for (prio = 0; prio < 4; prio++) { int h; - for (h = 0; h < IP6_SIT_HASH_SIZE; h++) { + for (h = 0; h < (prio ? IP6_SIT_HASH_SIZE : 1); h++) { struct ip_tunnel *t; t = rtnl_dereference(sitn->tunnels[prio][h]); |