2 files changed, 14 insertions, 3 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 6cea83b48cad..8156b33ee3e7 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1615,7 +1615,6 @@ static int team_init(struct net_device *dev)
         int err;
 
         team->dev = dev;
-        mutex_init(&team->lock);
         team_set_no_mode(team);
 
         team->pcpu_stats = netdev_alloc_pcpu_stats(struct team_pcpu_stats);
@@ -1642,6 +1641,9 @@ static int team_init(struct net_device *dev)
                 goto err_options_register;
         netif_carrier_off(dev);
 
+        lockdep_register_key(&team->team_lock_key);
+        __mutex_init(&team->lock, "team->team_lock_key", &team->team_lock_key);
+
         return 0;
 
 err_options_register:
@@ -1671,6 +1673,7 @@ static void team_uninit(struct net_device *dev)
         team_queue_override_fini(team);
         mutex_unlock(&team->lock);
         netdev_change_features(dev);
+        lockdep_unregister_key(&team->team_lock_key);
 }
 
 static void team_destructor(struct net_device *dev)
@@ -1974,8 +1977,15 @@ static int team_del_slave(struct net_device *dev, struct net_device *port_dev)
         err = team_port_del(team, port_dev);
         mutex_unlock(&team->lock);
 
-        if (!err)
-                netdev_change_features(dev);
+        if (err)
+                return err;
+
+        if (netif_is_team_master(port_dev)) {
+                lockdep_unregister_key(&team->team_lock_key);
+                lockdep_register_key(&team->team_lock_key);
+                lockdep_set_class(&team->lock, &team->team_lock_key);
+        }
+        netdev_change_features(dev);
 
         return err;
 }
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 06faa066496f..ec7e4bd07f82 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -223,6 +223,7 @@ struct team {
                 atomic_t count_pending;
                 struct delayed_work dw;
         } mcast_rejoin;
+        struct lock_class_key team_lock_key;
         long mode_priv[TEAM_MODE_PRIV_LONGS];
 };