diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-22 22:32:45 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-24 01:35:21 +0100 |
commit | 38009d04f323751d21d01857d3df7dd4571408f4 (patch) | |
tree | 617e7362c8af5abee29dc029955d068960c76a6b /patches/collateral-evolutions | |
parent | d036d4aaef0edb334ff0a7a28af8befdde939070 (diff) |
backports: remove usage of net_device member qdisc_tx_busylock
This member was added ion more recent kernel versions.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions')
-rw-r--r-- | patches/collateral-evolutions/network/86-qdisc_tx_busylock/ieee802154.patch | 24 |
1 files changed, 24 insertions, 0 deletions
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 00000000..d685b3cd --- /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; + } + |