[PATCH 11/12] backports: remove usage of net_device member qdisc_tx_busylock

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This member was added ion more recent kernel versions.

Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
 .../network/86-qdisc_tx_busylock/ieee802154.patch  |   24 ++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch

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
index 0000000..d685b3c
--- /dev/null
+++ b/patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch
@@ -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;
+ }
+ 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux