1 files changed, 13 insertions, 22 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 38c5909e1c35..c93df7cf187b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -925,6 +925,7 @@ struct dev_ifalias {
 struct devlink;
 struct tlsdev_ops;
 
+
 /*
  * This structure defines the management hooks for network devices.
  * The following hooks can be defined; unless noted otherwise, they are
@@ -1760,9 +1761,13 @@ enum netdev_priv_flags {
  *      @phydev:        Physical device may attach itself
  *                      for hardware timestamping
  *      @sfp_bus:       attached &struct sfp_bus structure.
- *
- *      @qdisc_tx_busylock: lockdep class annotating Qdisc->busylock spinlock
- *      @qdisc_running_key: lockdep class annotating Qdisc->running seqcount
+ *      @qdisc_tx_busylock_key: lockdep class annotating Qdisc->busylock
+                                spinlock
+ *      @qdisc_running_key:     lockdep class annotating Qdisc->running seqcount
+ *      @qdisc_xmit_lock_key:   lockdep class annotating
+ *                              netdev_queue->_xmit_lock spinlock
+ *      @addr_list_lock_key:    lockdep class annotating
+ *                              net_device->addr_list_lock spinlock
  *
  *      @proto_down:    protocol port state information can be sent to the
  *                      switch driver and used to set the phys state of the
@@ -2049,8 +2054,10 @@ struct net_device {
 #endif
         struct phy_device       *phydev;
         struct sfp_bus          *sfp_bus;
-        struct lock_class_key   *qdisc_tx_busylock;
-        struct lock_class_key   *qdisc_running_key;
+        struct lock_class_key   qdisc_tx_busylock_key;
+        struct lock_class_key   qdisc_running_key;
+        struct lock_class_key   qdisc_xmit_lock_key;
+        struct lock_class_key   addr_list_lock_key;
         bool                    proto_down;
         unsigned                wol_enabled:1;
 };
@@ -2128,23 +2135,6 @@ static inline void netdev_for_each_tx_queue(struct net_device *dev,
                 f(dev, &dev->_tx[i], arg);
 }
 
-#define netdev_lockdep_set_classes(dev)                         \
-{                                                               \
-        static struct lock_class_key qdisc_tx_busylock_key;     \
-        static struct lock_class_key qdisc_running_key;         \
-        static struct lock_class_key qdisc_xmit_lock_key;       \
-        static struct lock_class_key dev_addr_list_lock_key;    \
-        unsigned int i;                                         \
-                                                                \
-        (dev)->qdisc_tx_busylock = &qdisc_tx_busylock_key;      \
-        (dev)->qdisc_running_key = &qdisc_running_key;          \
-        lockdep_set_class(&(dev)->addr_list_lock,               \
-                          &dev_addr_list_lock_key);             \
-        for (i = 0; i < (dev)->num_tx_queues; i++)              \
-                lockdep_set_class(&(dev)->_tx[i]._xmit_lock,    \
-                                  &qdisc_xmit_lock_key);        \
-}
-
 u16 netdev_pick_tx(struct net_device *dev, struct sk_buff *skb,
                      struct net_device *sb_dev);
 struct netdev_queue *netdev_core_pick_tx(struct net_device *dev,
@@ -3143,6 +3133,7 @@ static inline void netif_stop_queue(struct net_device *dev)
 }
 
 void netif_tx_stop_all_queues(struct net_device *dev);
+void netdev_update_lockdep_key(struct net_device *dev);
 
 static inline bool netif_tx_queue_stopped(const struct netdev_queue *dev_queue)
 {