From 38009d04f323751d21d01857d3df7dd4571408f4 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 22 Feb 2014 22:32:45 +0100 Subject: [PATCH] backports: remove usage of net_device member qdisc_tx_busylock This member was added ion more recent kernel versions. Signed-off-by: Hauke Mehrtens --- .../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 000000000000..d685b3cdcdcb --- /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; + } + -- 2.30.2