Usage of the bt_tx_busylock variable was already patched but not the
declaration which caused a compile warning. This patch introduces a
define statement that also excludes the variable declaration.
Signed-off-by: Florian Grandel <fgrandel@xxxxxxxxx>
---
.../network/0030-qdisc_tx_busylock/bluetooth.patch | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
index 4ced79a..62d2fe2 100644
--- a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
@@ -1,6 +1,16 @@
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
-@@ -659,7 +659,9 @@ static void bt_set_lockdep_class_one(str
+@@ -645,7 +645,9 @@ static netdev_tx_t bt_xmit(struct sk_buff *skb, struct net_device *netdev)
+ return err < 0 ? NET_XMIT_DROP : err;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(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,
+@@ -658,7 +660,9 @@ static void bt_set_lockdep_class_one(struct net_device *dev,
static int bt_dev_init(struct net_device *dev)
{
netdev_for_each_tx_queue(dev, bt_set_lockdep_class_one, NULL);
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
