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

Commit 0d7dd798 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: ipvlan: call netdev_lockdep_set_classes() 



In case a qdisc is used on a ipvlan device, we need to use different
lockdep classes to avoid false positives.

Use the new netdev_lockdep_set_classes() generic helper.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24ffd752

drivers/net/ipvlan/ipvlan_main.c

+1 −21
Original line number Diff line number Diff line
@@ -80,13 +80,6 @@ static void ipvlan_port_destroy(struct net_device *dev) 
	kfree_rcu(port, rcu);

}



/* ipvlan network devices have devices nesting below it and are a special

 * "super class" of normal network devices; split their locks off into a

 * separate class since they always nest.

 */

static struct lock_class_key ipvlan_netdev_xmit_lock_key;

static struct lock_class_key ipvlan_netdev_addr_lock_key;



#define IPVLAN_FEATURES \

	(NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \
@@ -96,19 +89,6 @@ static struct lock_class_key ipvlan_netdev_addr_lock_key; 
#define IPVLAN_STATE_MASK \

	((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT))



static void ipvlan_set_lockdep_class_one(struct net_device *dev,

					 struct netdev_queue *txq,

					 void *_unused)

{

	lockdep_set_class(&txq->_xmit_lock, &ipvlan_netdev_xmit_lock_key);

}



static void ipvlan_set_lockdep_class(struct net_device *dev)

{

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

	netdev_for_each_tx_queue(dev, ipvlan_set_lockdep_class_one, NULL);

}



static int ipvlan_init(struct net_device *dev)

{

	struct ipvl_dev *ipvlan = netdev_priv(dev);
@@ -123,7 +103,7 @@ static int ipvlan_init(struct net_device *dev) 
	dev->gso_max_segs = phy_dev->gso_max_segs;

	dev->hard_header_len = phy_dev->hard_header_len;



	ipvlan_set_lockdep_class(dev);

	netdev_lockdep_set_classes(dev);



	ipvlan->pcpu_stats = alloc_percpu(struct ipvl_pcpu_stats);

	if (!ipvlan->pcpu_stats)