summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-10-25 13:55:02 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-10-25 14:44:50 +0200
commit1f4af51943861539df14c1d1cf6c36c8af65cc9c (patch)
tree288e3eae7a5ac5c99f77f582990332619bde4eda /patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch
parent9fa35102ba209f32f682cf61eea9dff8de4a5ec3 (diff)
backports: refresh patches on v3.18-rc1v3.18-rc1-1
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.62 [ OK ] 4 3.3.8 [ OK ] 5 3.4.104 [ OK ] 6 3.5.7 [ OK ] 7 3.6.11 [ OK ] 8 3.7.10 [ OK ] 9 3.8.13 [ OK ] 10 3.9.11 [ OK ] 11 3.10.58 [ OK ] 12 3.11.10 [ OK ] 13 3.12.31 [ OK ] 14 3.13.11 [ OK ] 15 3.14.22 [ OK ] 16 3.15.10 [ OK ] 17 3.16.6 [ OK ] 18 3.17.1 [ OK ] 19 3.18-rc1 [ OK ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch')
-rw-r--r--patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch
index 7b0d9c79..0533c202 100644
--- a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch
+++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/ieee802154.patch
@@ -1,6 +1,6 @@
--- a/net/ieee802154/6lowpan_rtnl.c
+++ b/net/ieee802154/6lowpan_rtnl.c
-@@ -444,7 +444,9 @@ static struct header_ops lowpan_header_o
+@@ -442,7 +442,9 @@ static struct header_ops lowpan_header_o
.create = lowpan_header_create,
};
@@ -10,7 +10,7 @@
static struct lock_class_key lowpan_netdev_xmit_lock_key;
static void lowpan_set_lockdep_class_one(struct net_device *dev,
-@@ -459,7 +461,9 @@ static void lowpan_set_lockdep_class_one
+@@ -457,7 +459,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);