diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-05 21:42:34 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-07 17:44:17 +0100 |
| commit | 7d07501a8b71a63644693133b94a46dc72bf113b (patch) | |
| tree | 2a419e3bbe8189d6666dee9635b4db2c33e4a880 /patches/collateral-evolutions/network/0050-iov_iter | |
| parent | 258c9f45411bd468953e16e60cc4c1821f322320 (diff) | |
patches: refresh on next-20151013backports-20151013
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.72 [ OK ]
4 3.3.8 [ OK ]
5 3.4.110 [ 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.92 [ OK ]
12 3.11.10 [ OK ]
13 3.12.49 [ OK ]
14 3.13.11 [ OK ]
15 3.14.56 [ OK ]
16 3.15.10 [ OK ]
17 3.16.7 [ OK ]
18 3.17.8 [ OK ]
19 3.18.23 [ OK ]
20 3.19.8 [ OK ]
21 4.0.9 [ OK ]
22 4.1.12 [ OK ]
23 4.2.5 [ OK ]
24 4.3-rc7 [ OK ]
manual changes done to the following patches:
* patches/collateral-evolutions/network/0059-uuid-in-mei/nfc.patch
* patches/collateral-evolutions/network/0013-fix-makefile-includes/brcmfmac.patch
* patches/collateral-evolutions/network/0062-acpi-gpio-remove/hci_bcm.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network/0050-iov_iter')
| -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 0a60b784..d17c4893 100644 --- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch +++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch @@ -49,7 +49,7 @@ int l2cap_init_sockets(void); --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c -@@ -533,11 +533,18 @@ static int send_pkt(struct l2cap_chan *c +@@ -532,11 +532,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) { -@@ -1056,6 +1063,9 @@ static const struct l2cap_ops bt_6lowpan +@@ -1036,6 +1043,9 @@ static const struct l2cap_ops bt_6lowpan .suspend = chan_suspend_cb, .get_sndtimeo = chan_get_sndtimeo_cb, .alloc_skb = chan_alloc_skb_cb, @@ -175,7 +175,7 @@ l2cap_chan_send(chan, &msg, 1 + len); -@@ -3058,6 +3063,9 @@ static const struct l2cap_ops smp_chan_o +@@ -3059,6 +3064,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) -@@ -3106,6 +3114,9 @@ static const struct l2cap_ops smp_root_c +@@ -3107,6 +3115,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, |