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

net: dsa: remove lockdep class for DSA slave 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 slave interfaces to have their own lockdep
class.

Cc: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8db2bc79

net/dsa/slave.c

+0 −12
Original line number Diff line number Diff line
@@ -1877,15 +1877,6 @@ void dsa_slave_setup_tagger(struct net_device *slave) 
		slave->features |= NETIF_F_HW_VLAN_CTAG_FILTER;

}



static struct lock_class_key dsa_slave_netdev_xmit_lock_key;

static void dsa_slave_set_lockdep_class_one(struct net_device *dev,

					    struct netdev_queue *txq,

					    void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock,

			  &dsa_slave_netdev_xmit_lock_key);

}



int dsa_slave_suspend(struct net_device *slave_dev)

{

	struct dsa_port *dp = dsa_slave_to_port(slave_dev);
@@ -1948,9 +1939,6 @@ int dsa_slave_create(struct dsa_port *port) 
		slave_dev->max_mtu = ds->ops->port_max_mtu(ds, port->index);

	SET_NETDEV_DEVTYPE(slave_dev, &dsa_type);



	netdev_for_each_tx_queue(slave_dev, dsa_slave_set_lockdep_class_one,

				 NULL);



	SET_NETDEV_DEV(slave_dev, port->ds->dev);

	slave_dev->dev.of_node = port->dn;

	slave_dev->vlan_features = master->vlan_features;