1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 0a1bb8387d96..a380649bf6b5 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1203,8 +1203,10 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
                 goto err_dev_open;
         }
 
+        netif_addr_lock_bh(dev);
         dev_uc_sync_multiple(port_dev, dev);
         dev_mc_sync_multiple(port_dev, dev);
+        netif_addr_unlock_bh(dev);
 
         err = vlan_vids_add_by_dev(port_dev, dev);
         if (err) {
@@ -2000,6 +2002,8 @@ static const struct net_device_ops team_netdev_ops = {
         .ndo_add_slave          = team_add_slave,
         .ndo_del_slave          = team_del_slave,
         .ndo_fix_features       = team_fix_features,
+        .ndo_neigh_construct    = netdev_default_l2upper_neigh_construct,
+        .ndo_neigh_destroy      = netdev_default_l2upper_neigh_destroy,
         .ndo_change_carrier     = team_change_carrier,
         .ndo_bridge_setlink     = switchdev_port_bridge_setlink,
         .ndo_bridge_getlink     = switchdev_port_bridge_getlink,