summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-04-19 22:58:34 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2016-04-30 22:39:05 +0200
commite3c56e41f73e4b7bdd8ae7d5f5ef56970bc4db41 (patch)
treee846fc9aef43fedbc6fd9381fb65343c6d708323 /patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
parent370e6628cfad3271cbe29af9ceb151a1c0af2af2 (diff)
patches: refresh on next-20160216backports-20160216
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.79 [ OK ] 4 3.3.8 [ OK ] 5 3.4.112 [ 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.101 [ OK ] 12 3.11.10 [ OK ] 13 3.12.59 [ OK ] 14 3.13.11 [ OK ] 15 3.14.67 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.32 [ OK ] 20 4.1.23 [ OK ] 21 4.3.6 [ OK ] 22 4.4.8 [ OK ] 23 4.5.2 [ OK ] 24 4.6-rc5 [ FAIL ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch')
-rw-r--r--patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
index 67786812..0b88b613 100644
--- a/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch
@@ -1,6 +1,6 @@
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
-@@ -623,7 +623,9 @@ static netdev_tx_t bt_xmit(struct sk_buf
+@@ -628,7 +628,9 @@ static netdev_tx_t bt_xmit(struct sk_buf
return err < 0 ? NET_XMIT_DROP : err;
}
@@ -10,7 +10,7 @@
static struct lock_class_key bt_netdev_xmit_lock_key;
static void bt_set_lockdep_class_one(struct net_device *dev,
-@@ -636,7 +638,9 @@ static void bt_set_lockdep_class_one(str
+@@ -641,7 +643,9 @@ static void bt_set_lockdep_class_one(str
static int bt_dev_init(struct net_device *dev)
{
netdev_for_each_tx_queue(dev, bt_set_lockdep_class_one, NULL);