Merge branch 'merge'

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 0641f54fc638..889f338132fa 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -122,6 +122,12 @@ struct bpqdev {
 
 static LIST_HEAD(bpq_devices);
 
+/*
+ * bpqether network devices are paired with ethernet devices below them, so
+ * form a special "super class" of normal ethernet devices; split their locks
+ * off into a separate class since they always nest.
+ */
+static struct lock_class_key bpq_netdev_xmit_lock_key;
 
 /* ------------------------------------------------------------------------ */
 
@@ -528,6 +534,7 @@ static int bpq_new_device(struct net_device *edev)
         err = register_netdevice(ndev);
         if (err)
                 goto error;
+        lockdep_set_class(&ndev->_xmit_lock, &bpq_netdev_xmit_lock_key);
 
         /* List protected by RTNL */
         list_add_rcu(&bpq->bpq_list, &bpq_devices);