diff options
author | Eric Dumazet <edumazet@google.com> | 2016-06-09 10:45:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-09 16:28:37 -0400 |
commit | d3fff6c443fe8f8a5ef2bdcea45e2ff39db948c7 (patch) | |
tree | ec632344dab9ba6c7a3767aa4054e682ddf5871c /net/bluetooth | |
parent | 52fbb2907988aa0583c6d9d53a56aee090b2df7e (diff) |
net: add netdev_lockdep_set_classes() helper
It is time to add netdev_lockdep_set_classes() helper
so that lockdep annotations per device type are easier to manage.
This removes a lot of copies and missing annotations.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/6lowpan.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index 977a11e418d0..d020299baba4 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c | |||
@@ -627,22 +627,9 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev) | |||
627 | return err < 0 ? NET_XMIT_DROP : err; | 627 | return err < 0 ? NET_XMIT_DROP : err; |
628 | } | 628 | } |
629 | 629 | ||
630 | static struct lock_class_key bt_tx_busylock; | ||
631 | static struct lock_class_key bt_netdev_xmit_lock_key; | ||
632 | static struct lock_class_key bt_qdisc_running_key; | ||
633 | |||
634 | static void bt_set_lockdep_class_one(struct net_device *dev, | ||
635 | struct netdev_queue *txq, | ||
636 | void *_unused) | ||
637 | { | ||
638 | lockdep_set_class(&txq->_xmit_lock, &bt_netdev_xmit_lock_key); | ||
639 | } | ||
640 | |||
641 | static int bt_dev_init(struct net_device *dev) | 630 | static int bt_dev_init(struct net_device *dev) |
642 | { | 631 | { |
643 | netdev_for_each_tx_queue(dev, bt_set_lockdep_class_one, NULL); | 632 | netdev_lockdep_set_classes(dev); |
644 | dev->qdisc_tx_busylock = &bt_tx_busylock; | ||
645 | dev->qdisc_running_key = &bt_qdisc_running_key; | ||
646 | 633 | ||
647 | return 0; | 634 | return 0; |
648 | } | 635 | } |