diff options
| -rw-r--r-- | patches/collateral-evolutions/network/0030-qdisc_tx_busylock/bluetooth.patch | 2 | ||||
| -rw-r--r-- | patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch | 8 |
2 files changed, 5 insertions, 5 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 0c63a674..8626c3bf 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 -@@ -663,7 +663,9 @@ static void bt_set_lockdep_class_one(str +@@ -664,7 +664,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); diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch index a2989a44..333f27a9 100644 --- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch +++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch @@ -1,6 +1,6 @@ --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h -@@ -609,6 +609,10 @@ struct l2cap_ops { +@@ -608,6 +608,10 @@ struct l2cap_ops { struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan, unsigned long hdr_len, unsigned long len, int nb); @@ -11,7 +11,7 @@ }; struct l2cap_conn { -@@ -902,6 +906,31 @@ static inline long l2cap_chan_no_get_snd +@@ -901,6 +905,31 @@ static inline long l2cap_chan_no_get_snd return 0; } @@ -45,7 +45,7 @@ int l2cap_init_sockets(void); --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c -@@ -537,11 +537,18 @@ static int send_pkt(struct l2cap_chan *c +@@ -538,11 +538,18 @@ static int send_pkt(struct l2cap_chan *c */ chan->data = skb; @@ -64,7 +64,7 @@ err = l2cap_chan_send(chan, &msg, skb->len); if (err > 0) { -@@ -1052,6 +1059,7 @@ static const struct l2cap_ops bt_6lowpan +@@ -1053,6 +1060,7 @@ static const struct l2cap_ops bt_6lowpan .suspend = chan_suspend_cb, .get_sndtimeo = chan_get_sndtimeo_cb, .alloc_skb = chan_alloc_skb_cb, |