diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-06-09 07:45:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-09 13:28:37 -0700 |
| commit | 24ffd752007fb04e8efb560029c6076f6f3c0c5e (patch) | |
| tree | 060e8417cf049656f6482796332e84f446c982e2 /drivers/net/macvlan.c | |
| parent | 78e7a2ae872770e5f26bf794b97b7b8e3e30ccfd (diff) | |
| download | linux-24ffd752007fb04e8efb560029c6076f6f3c0c5e.tar.gz linux-24ffd752007fb04e8efb560029c6076f6f3c0c5e.tar.bz2 linux-24ffd752007fb04e8efb560029c6076f6f3c0c5e.zip | |
net: macvlan: call netdev_lockdep_set_classes()
In case a qdisc is used on a macvlan device, we need to use different
lockdep classes to avoid false positives.
Use the new netdev_lockdep_set_classes() generic helper.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 0c65bd914aed..cd9b53834bf6 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -788,7 +788,6 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu) * "super class" of normal network devices; split their locks off into a * 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 ALWAYS_ON_FEATURES \ @@ -809,20 +808,12 @@ static int macvlan_get_nest_level(struct net_device *dev) return ((struct macvlan_dev *)netdev_priv(dev))->nest_level; } -static void macvlan_set_lockdep_class_one(struct net_device *dev, - struct netdev_queue *txq, - void *_unused) -{ - lockdep_set_class(&txq->_xmit_lock, - &macvlan_netdev_xmit_lock_key); -} - static void macvlan_set_lockdep_class(struct net_device *dev) { + netdev_lockdep_set_classes(dev); lockdep_set_class_and_subclass(&dev->addr_list_lock, &macvlan_netdev_addr_lock_key, macvlan_get_nest_level(dev)); - netdev_for_each_tx_queue(dev, macvlan_set_lockdep_class_one, NULL); } static int macvlan_init(struct net_device *dev) |