diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-01 01:31:00 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-01 01:31:00 +0200 |
| commit | 0d8730f07c822a351a624462918c7109cdc7f402 (patch) | |
| tree | 3539d4c7c098894f3b2d5f49134c8cfccc06aaca /net/ipv6/addrconf.c | |
| parent | net: phylink: fix NULL pl->pcs dereference during phylink_pcs_poll_start (diff) | |
| parent | Merge tag 'net-5.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-0d8730f07c822a351a624462918c7109cdc7f402.tar.xz linux-0d8730f07c822a351a624462918c7109cdc7f402.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c
9c5de246c1db ("net: sparx5: mdb add/del handle non-sparx5 devices")
fbb89d02e33a ("net: sparx5: Allow mdb entries to both CPU and ports")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index fa9f72895a63..88becb037eb6 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1109,10 +1109,6 @@ ipv6_add_addr(struct inet6_dev *idev, struct ifa6_config *cfg, goto out; } - if (net->ipv6.devconf_all->disable_policy || - idev->cnf.disable_policy) - f6i->dst_nopolicy = true; - neigh_parms_data_state_setall(idev->nd_parms); ifa->addr = *cfg->pfx; @@ -5176,9 +5172,9 @@ next: fillargs->event = RTM_GETMULTICAST; /* multicast address */ - for (ifmca = rcu_dereference(idev->mc_list); + for (ifmca = rtnl_dereference(idev->mc_list); ifmca; - ifmca = rcu_dereference(ifmca->next), ip_idx++) { + ifmca = rtnl_dereference(ifmca->next), ip_idx++) { if (ip_idx < s_ip_idx) continue; err = inet6_fill_ifmcaddr(skb, ifmca, fillargs); |