summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-04-03 23:32:37 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-04-06 00:12:03 +0200
commit4c0f6113325a45a0be269dd9dea66a638c4a86e0 (patch)
treee6ae7480bbd8822f176dd0f7715ee288b503ea0e /patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
parent15ad501db81d2ff05d43affbb8c5374677368d5a (diff)
patches: refresh on next-20150313backports-20150313
1 3.0.101 [ OK ] 2 3.1.10 [ OK ] 3 3.2.68 [ 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.73 [ OK ] 12 3.11.10 [ OK ] 13 3.12.39 [ OK ] 14 3.13.11 [ OK ] 15 3.14.37 [ OK ] 16 3.15.10 [ OK ] 17 3.16.7 [ OK ] 18 3.17.8 [ OK ] 19 3.18.10 [ OK ] 20 3.19.3 [ OK ] 21 4.0-rc6 [ OK ] 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.patch4
1 files changed, 2 insertions, 2 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..836a177a 100644
--- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
+++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch
@@ -175,7 +175,7 @@
l2cap_chan_send(chan, &msg, 1 + len);
-@@ -2871,6 +2876,9 @@ static const struct l2cap_ops smp_chan_o
+@@ -2877,6 +2882,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)
-@@ -2919,6 +2927,9 @@ static const struct l2cap_ops smp_root_c
+@@ -2925,6 +2933,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,