summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch')
-rw-r--r--patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
index d17c4893..6e242f78 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
-@@ -611,6 +611,12 @@ struct l2cap_ops {
+@@ -613,6 +613,12 @@ struct l2cap_ops {
struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
unsigned long hdr_len,
unsigned long len, int nb);
@@ -13,7 +13,7 @@
};
struct l2cap_conn {
-@@ -904,6 +910,33 @@ static inline long l2cap_chan_no_get_snd
+@@ -906,6 +912,33 @@ static inline long l2cap_chan_no_get_snd
return 0;
}
@@ -49,7 +49,7 @@
int l2cap_init_sockets(void);
--- a/net/bluetooth/6lowpan.c
+++ b/net/bluetooth/6lowpan.c
-@@ -532,11 +532,18 @@ static int send_pkt(struct l2cap_chan *c
+@@ -510,11 +510,18 @@ static int send_pkt(struct l2cap_chan *c
*/
chan->data = skb;
@@ -68,7 +68,7 @@
err = l2cap_chan_send(chan, &msg, skb->len);
if (err > 0) {
-@@ -1036,6 +1043,9 @@ static const struct l2cap_ops bt_6lowpan
+@@ -1014,6 +1021,9 @@ static const struct l2cap_ops bt_6lowpan
.suspend = chan_suspend_cb,
.get_sndtimeo = chan_get_sndtimeo_cb,
.alloc_skb = chan_alloc_skb_cb,
@@ -134,7 +134,7 @@
sent += count;
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
-@@ -1360,6 +1360,15 @@ static struct sk_buff *l2cap_sock_alloc_
+@@ -1383,6 +1383,15 @@ static struct sk_buff *l2cap_sock_alloc_
return skb;
}
@@ -150,7 +150,7 @@
static void l2cap_sock_ready_cb(struct l2cap_chan *chan)
{
struct sock *sk = chan->data;
-@@ -1444,6 +1453,9 @@ static const struct l2cap_ops l2cap_chan
+@@ -1467,6 +1476,9 @@ static const struct l2cap_ops l2cap_chan
.set_shutdown = l2cap_sock_set_shutdown_cb,
.get_sndtimeo = l2cap_sock_get_sndtimeo_cb,
.alloc_skb = l2cap_sock_alloc_skb_cb,
@@ -175,7 +175,7 @@
l2cap_chan_send(chan, &msg, 1 + len);
-@@ -3059,6 +3064,9 @@ static const struct l2cap_ops smp_chan_o
+@@ -3084,6 +3089,9 @@ static const struct l2cap_ops smp_chan_o
.suspend = l2cap_chan_no_suspend,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
@@ -185,7 +185,7 @@
};
static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan)
-@@ -3107,6 +3115,9 @@ static const struct l2cap_ops smp_root_c
+@@ -3132,6 +3140,9 @@ static const struct l2cap_ops smp_root_c
.resume = l2cap_chan_no_resume,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,