From 0bdb080c70495ea4efbed7661b4fe6100bd5adde Mon Sep 17 00:00:00 2001 From: Dominik Sliwa Date: Thu, 21 Feb 2019 10:23:08 +0100 Subject: Revert "backports: Remove unused parts" This reverts commit ab3fd3b9a801a9faa2619e2e65207e736f859a6d. --- patches/0030-qdisc_tx_busylock/bluetooth.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/0030-qdisc_tx_busylock/bluetooth.patch (limited to 'patches/0030-qdisc_tx_busylock/bluetooth.patch') diff --git a/patches/0030-qdisc_tx_busylock/bluetooth.patch b/patches/0030-qdisc_tx_busylock/bluetooth.patch new file mode 100644 index 00000000..1025f03b --- /dev/null +++ b/patches/0030-qdisc_tx_busylock/bluetooth.patch @@ -0,0 +1,22 @@ +--- a/net/bluetooth/6lowpan.c ++++ b/net/bluetooth/6lowpan.c +@@ -628,7 +628,9 @@ static netdev_tx_t bt_xmit(struct sk_buf + return err < 0 ? NET_XMIT_DROP : err; + } + ++#if LINUX_VERSION_IS_GEQ(3,7,0) + static struct lock_class_key bt_tx_busylock; ++#endif + static struct lock_class_key bt_netdev_xmit_lock_key; + + static void bt_set_lockdep_class_one(struct net_device *dev, +@@ -641,7 +643,9 @@ static void bt_set_lockdep_class_one(str + static int bt_dev_init(struct net_device *dev) + { + netdev_for_each_tx_queue(dev, bt_set_lockdep_class_one, NULL); ++#if LINUX_VERSION_IS_GEQ(3,7,0) + dev->qdisc_tx_busylock = &bt_tx_busylock; ++#endif + + return 0; + } -- cgit v1.2.3