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.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
index 89396386..afb61ca9 100644
--- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
@@ -80,7 +80,7 @@
.defer = l2cap_chan_no_defer,
--- a/net/bluetooth/a2mp.c
+++ b/net/bluetooth/a2mp.c
-@@ -62,7 +62,12 @@ static void a2mp_send(struct amp_mgr *mg
+@@ -60,7 +60,12 @@ void a2mp_send(struct amp_mgr *mgr, u8 c
memset(&msg, 0, sizeof(msg));
@@ -93,7 +93,7 @@
l2cap_chan_send(chan, &msg, total_len);
-@@ -738,6 +743,9 @@ static const struct l2cap_ops a2mp_chan_
+@@ -719,6 +724,9 @@ static const struct l2cap_ops a2mp_chan_
.resume = l2cap_chan_no_resume,
.set_shutdown = l2cap_chan_no_set_shutdown,
.get_sndtimeo = l2cap_chan_no_get_sndtimeo,
@@ -105,7 +105,7 @@
static struct l2cap_chan *a2mp_chan_open(struct l2cap_conn *conn, bool locked)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
-@@ -2120,7 +2120,12 @@ static inline int l2cap_skbuff_fromiovec
+@@ -2113,7 +2113,12 @@ static inline int l2cap_skbuff_fromiovec
struct sk_buff **frag;
int sent = 0;
@@ -118,7 +118,7 @@
return -EFAULT;
sent += count;
-@@ -2140,8 +2145,13 @@ static inline int l2cap_skbuff_fromiovec
+@@ -2133,8 +2138,13 @@ static inline int l2cap_skbuff_fromiovec
*frag = tmp;