Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf508b12 authored by David S. Miller's avatar David S. Miller
Browse files

netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep. 



The new address list lock needs to handle the same device layering
issues that the _xmit_lock one does.

This integrates work done by Patrick McHardy.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d29f749e

drivers/net/bonding/bond_main.c

+3 −0
Original line number Diff line number Diff line
@@ -5041,6 +5041,7 @@ static int bond_check_params(struct bond_params *params) 
}



static struct lock_class_key bonding_netdev_xmit_lock_key;

static struct lock_class_key bonding_netdev_addr_lock_key;



static void bond_set_lockdep_class_one(struct net_device *dev,

				       struct netdev_queue *txq,
@@ -5052,6 +5053,8 @@ static void bond_set_lockdep_class_one(struct net_device *dev, 


static void bond_set_lockdep_class(struct net_device *dev)

{

	lockdep_set_class(&dev->addr_list_lock,

			  &bonding_netdev_addr_lock_key);

	netdev_for_each_tx_queue(dev, bond_set_lockdep_class_one, NULL);

}

drivers/net/hamradio/bpqether.c

+2 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ static LIST_HEAD(bpq_devices); 
 * off into a separate class since they always nest.

 */

static struct lock_class_key bpq_netdev_xmit_lock_key;

static struct lock_class_key bpq_netdev_addr_lock_key;



static void bpq_set_lockdep_class_one(struct net_device *dev,

				      struct netdev_queue *txq,
@@ -133,6 +134,7 @@ static void bpq_set_lockdep_class_one(struct net_device *dev, 


static void bpq_set_lockdep_class(struct net_device *dev)

{

	lockdep_set_class(&dev->addr_list_lock, &bpq_netdev_addr_lock_key);

	netdev_for_each_tx_queue(dev, bpq_set_lockdep_class_one, NULL);

}

drivers/net/macvlan.c

+3 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu) 
 * separate class since they always nest.

 */

static struct lock_class_key macvlan_netdev_xmit_lock_key;

static struct lock_class_key macvlan_netdev_addr_lock_key;



#define MACVLAN_FEATURES \

	(NETIF_F_SG | NETIF_F_ALL_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \
@@ -295,6 +296,8 @@ static void macvlan_set_lockdep_class_one(struct net_device *dev, 


static void macvlan_set_lockdep_class(struct net_device *dev)

{

	lockdep_set_class(&dev->addr_list_lock,

			  &macvlan_netdev_addr_lock_key);

	netdev_for_each_tx_queue(dev, macvlan_set_lockdep_class_one, NULL);

}

drivers/net/wireless/hostap/hostap_hw.c

+3 −0
Original line number Diff line number Diff line
@@ -3101,6 +3101,7 @@ static void prism2_clear_set_tim_queue(local_info_t *local) 
 * This is a natural nesting, which needs a split lock type.

 */

static struct lock_class_key hostap_netdev_xmit_lock_key;

static struct lock_class_key hostap_netdev_addr_lock_key;



static void prism2_set_lockdep_class_one(struct net_device *dev,

					 struct netdev_queue *txq,
@@ -3112,6 +3113,8 @@ static void prism2_set_lockdep_class_one(struct net_device *dev, 


static void prism2_set_lockdep_class(struct net_device *dev)

{

	lockdep_set_class(&dev->addr_list_lock,

			  &hostap_netdev_addr_lock_key);

	netdev_for_each_tx_queue(dev, prism2_set_lockdep_class_one, NULL);

}

net/8021q/vlan_dev.c

+4 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ static void vlan_dev_set_rx_mode(struct net_device *vlan_dev) 
 * separate class since they always nest.

 */

static struct lock_class_key vlan_netdev_xmit_lock_key;

static struct lock_class_key vlan_netdev_addr_lock_key;



static void vlan_dev_set_lockdep_one(struct net_device *dev,

				     struct netdev_queue *txq,
@@ -581,6 +582,9 @@ static void vlan_dev_set_lockdep_one(struct net_device *dev, 


static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)

{

	lockdep_set_class_and_subclass(&dev->addr_list_lock,

				       &vlan_netdev_addr_lock_key,

				       subclass);

	netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass);

}