Commit 8db2bc79 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: remove lockdep class for DSA master address list 



Since commit 2f1e8ea7 ("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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45b987d5

net/dsa/master.c

+0 −4
Original line number Diff line number Diff line
@@ -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;
@@ -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);