diff options
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 980001c2cf96..72745ce588c6 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -285,7 +285,9 @@ static struct lock_class_key macvlan_netdev_xmit_lock_key; | |||
285 | #define MACVLAN_STATE_MASK \ | 285 | #define MACVLAN_STATE_MASK \ |
286 | ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) | 286 | ((1<<__LINK_STATE_NOCARRIER) | (1<<__LINK_STATE_DORMANT)) |
287 | 287 | ||
288 | static void macvlan_set_lockdep_class_one(struct netdev_queue *txq) | 288 | static void macvlan_set_lockdep_class_one(struct net_device *dev, |
289 | struct netdev_queue *txq, | ||
290 | void *_unused) | ||
289 | { | 291 | { |
290 | lockdep_set_class(&txq->_xmit_lock, | 292 | lockdep_set_class(&txq->_xmit_lock, |
291 | &macvlan_netdev_xmit_lock_key); | 293 | &macvlan_netdev_xmit_lock_key); |
@@ -293,7 +295,7 @@ static void macvlan_set_lockdep_class_one(struct netdev_queue *txq) | |||
293 | 295 | ||
294 | static void macvlan_set_lockdep_class(struct net_device *dev) | 296 | static void macvlan_set_lockdep_class(struct net_device *dev) |
295 | { | 297 | { |
296 | macvlan_set_lockdep_class_one(&dev->tx_queue); | 298 | netdev_for_each_tx_queue(dev, macvlan_set_lockdep_class_one, NULL); |
297 | } | 299 | } |
298 | 300 | ||
299 | static int macvlan_init(struct net_device *dev) | 301 | static int macvlan_init(struct net_device *dev) |