diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-27 23:18:43 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-29 21:38:52 +0200 |
| commit | 807a2bbfac26a6586d450103ff5fb26408e8cdf3 (patch) | |
| tree | 61bd56e313cad7ac8677aca09a90e5f66e0a1807 /patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch | |
| parent | 871f990c377b94a88f1d51e93412b68cfb70a8c7 (diff) | |
patches: refresh patches on v4.0.0v4.0.1-1linux-4.0.y
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.68 [ OK ]
4 3.3.8 [ OK ]
5 3.4.107 [ 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.75 [ OK ]
12 3.11.10 [ OK ]
13 3.12.40 [ OK ]
14 3.13.11 [ OK ]
15 3.14.39 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.12 [ OK ]
20 3.19.5 [ OK ]
21 4.0.0 [ OK ]
22 4.1-rc1 [ FAIL ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch')
| -rw-r--r-- | patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch | 8 |
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; |