backports: remove usage of net_device member qdisc_tx_busylock
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 22 Feb 2014 21:32:45 +0000 (22:32 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 24 Feb 2014 00:35:21 +0000 (01:35 +0100)
This member was added ion more recent kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch [new file with mode: 0644]

diff --git a/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch b/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch
new file mode 100644 (file)
index 0000000..d685b3c
--- /dev/null
@@ -0,0 +1,24 @@
+diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c
+index 8edfea5..04f18ab 100644
+--- a/net/ieee802154/6lowpan.c
++++ b/net/ieee802154/6lowpan.c
+@@ -530,7 +530,9 @@ static struct header_ops lowpan_header_o
+       .create = lowpan_header_create,
+ };
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+ static struct lock_class_key lowpan_tx_busylock;
++#endif
+ static struct lock_class_key lowpan_netdev_xmit_lock_key;
+ static void lowpan_set_lockdep_class_one(struct net_device *dev,
+@@ -545,7 +547,9 @@ static void lowpan_set_lockdep_class_one
+ static int lowpan_dev_init(struct net_device *dev)
+ {
+       netdev_for_each_tx_queue(dev, lowpan_set_lockdep_class_one, NULL);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
+       dev->qdisc_tx_busylock = &lowpan_tx_busylock;
++#endif
+       return 0;
+ }