Skip to content

Commit

Permalink
net: dsa: remove lockdep class for DSA master address list
Browse files Browse the repository at this point in the history
Since commit 2f1e8ea ("net: dsa: link interfaces with the DSA
master to get rid of lockdep warnings"), suggested by Cong Wang, the
DSA interfaces and their master have different dev->nested_level, which
makes netif_addr_lock() stop complaining about potentially recursive
locking on the same lock class.

So we no longer need DSA masters to have their own lockdep class.

Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vladimir Oltean authored and David S. Miller committed Feb 11, 2022
1 parent 45b987d commit 8db2bc7
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions net/dsa/master.c
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,6 @@ static const struct attribute_group dsa_group = {
.attrs = dsa_slave_attrs,
};

static struct lock_class_key dsa_master_addr_list_lock_key;

int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
{
struct dsa_switch *ds = cpu_dp->ds;
Expand All @@ -353,8 +351,6 @@ int dsa_master_setup(struct net_device *dev, struct dsa_port *cpu_dp)
wmb();

dev->dsa_ptr = cpu_dp;
lockdep_set_class(&dev->addr_list_lock,
&dsa_master_addr_list_lock_key);

dsa_master_set_promiscuity(dev, 1);

Expand Down

0 comments on commit 8db2bc7

Please sign in to comment.