From dd4a670a90f21e83fa771f258ec8a48ef394abaf Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 21 Feb 2015 19:35:19 +0100 Subject: patches: refresh patches on next-20150129 1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.67 [ OK ] 4 3.3.8 [ OK ] 5 3.4.106 [ 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.69 [ OK ] 12 3.11.10 [ OK ] 13 3.12.38 [ OK ] 14 3.13.11 [ OK ] 15 3.14.33 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.7 [ OK ] 20 3.19.0 [ OK ] manual changes do to: patches/collateral-evolutions/network/0049-no-pfmemalloc/igb.patch Signed-off-by: Hauke Mehrtens --- .../network/0050-iov_iter/bluetooth.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch') diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch index ac82e3f6..aa6d528c 100644 --- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch +++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch @@ -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 +@@ -533,11 +533,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 +@@ -1048,6 +1055,7 @@ static const struct l2cap_ops bt_6lowpan .suspend = chan_suspend_cb, .get_sndtimeo = chan_get_sndtimeo_cb, .alloc_skb = chan_alloc_skb_cb, @@ -97,7 +97,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 -@@ -2103,7 +2103,12 @@ static inline int l2cap_skbuff_fromiovec +@@ -2113,7 +2113,12 @@ static inline int l2cap_skbuff_fromiovec struct sk_buff **frag; int sent = 0; @@ -110,7 +110,7 @@ return -EFAULT; sent += count; -@@ -2123,8 +2128,13 @@ static inline int l2cap_skbuff_fromiovec +@@ -2133,8 +2138,13 @@ static inline int l2cap_skbuff_fromiovec *frag = tmp; @@ -126,7 +126,7 @@ sent += count; --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c -@@ -1336,6 +1336,13 @@ static struct sk_buff *l2cap_sock_alloc_ +@@ -1335,6 +1335,13 @@ static struct sk_buff *l2cap_sock_alloc_ return skb; } @@ -140,7 +140,7 @@ static void l2cap_sock_ready_cb(struct l2cap_chan *chan) { struct sock *sk = chan->data; -@@ -1420,6 +1427,7 @@ static const struct l2cap_ops l2cap_chan +@@ -1419,6 +1426,7 @@ 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, @@ -163,7 +163,7 @@ l2cap_chan_send(chan, &msg, 1 + len); -@@ -2867,6 +2872,7 @@ static const struct l2cap_ops smp_chan_o +@@ -2871,6 +2876,7 @@ 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, @@ -171,7 +171,7 @@ }; static inline struct l2cap_chan *smp_new_conn_cb(struct l2cap_chan *pchan) -@@ -2915,6 +2921,7 @@ static const struct l2cap_ops smp_root_c +@@ -2919,6 +2925,7 @@ 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, -- cgit v1.2.3