diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-26 23:37:19 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-28 23:50:56 +0200 |
| commit | c1a416852f24d166c51d8203703a1bddff1ad6f8 (patch) | |
| tree | ae48c1a8e0db1a790965762cfb0ad40b05fb66e3 /patches/collateral-evolutions/network | |
| parent | b6ec299ba6b70f36cb046527e7cb1c731e5fbdf9 (diff) | |
patches: refresh on next-20150626backports-20150626
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-rc8 [ OK ]
manual changes done to:
patches/collateral-evolutions/media/0005-dma-no-sync/v4l2.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions/network')
3 files changed, 11 insertions, 11 deletions
diff --git a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch index 39bf0779..a66b17fd 100644 --- a/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch +++ b/patches/collateral-evolutions/network/0050-iov_iter/bluetooth.patch @@ -68,7 +68,7 @@ err = l2cap_chan_send(chan, &msg, skb->len); if (err > 0) { -@@ -1048,6 +1055,9 @@ static const struct l2cap_ops bt_6lowpan +@@ -1050,6 +1057,9 @@ static const struct l2cap_ops bt_6lowpan .suspend = chan_suspend_cb, .get_sndtimeo = chan_get_sndtimeo_cb, .alloc_skb = chan_alloc_skb_cb, @@ -162,7 +162,7 @@ static void l2cap_sock_destruct(struct sock *sk) --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c -@@ -613,7 +613,12 @@ static void smp_send_cmd(struct l2cap_co +@@ -619,7 +619,12 @@ static void smp_send_cmd(struct l2cap_co memset(&msg, 0, sizeof(msg)); @@ -175,7 +175,7 @@ l2cap_chan_send(chan, &msg, 1 + len); -@@ -3047,6 +3052,9 @@ static const struct l2cap_ops smp_chan_o +@@ -3054,6 +3059,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) -@@ -3095,6 +3103,9 @@ static const struct l2cap_ops smp_root_c +@@ -3102,6 +3110,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, diff --git a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch index e89725b9..1d9e5044 100644 --- a/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch +++ b/patches/collateral-evolutions/network/0053-remove_wait_on_bit_timeout/btusb.patch @@ -1,6 +1,6 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1755,8 +1755,12 @@ static void btusb_intel_bootup(struct bt +@@ -1756,8 +1756,12 @@ static void btusb_intel_bootup(struct bt return; if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { @@ -13,7 +13,7 @@ } } -@@ -1773,8 +1777,12 @@ static void btusb_intel_secure_send_resu +@@ -1774,8 +1778,12 @@ static void btusb_intel_secure_send_resu if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) && test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { @@ -26,7 +26,7 @@ } } -@@ -2169,6 +2177,7 @@ static int btusb_setup_intel_new(struct +@@ -2176,6 +2184,7 @@ static int btusb_setup_intel_new(struct * and thus just timeout if that happens and fail the setup * of this device. */ @@ -34,7 +34,7 @@ err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING, TASK_INTERRUPTIBLE, msecs_to_jiffies(5000)); -@@ -2183,6 +2192,31 @@ static int btusb_setup_intel_new(struct +@@ -2190,6 +2199,31 @@ static int btusb_setup_intel_new(struct err = -ETIMEDOUT; goto done; } @@ -66,7 +66,7 @@ if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) { BT_ERR("%s: Firmware loading failed", hdev->name); -@@ -2222,6 +2256,7 @@ done: +@@ -2229,6 +2263,7 @@ done: */ BT_INFO("%s: Waiting for device to boot", hdev->name); @@ -74,7 +74,7 @@ err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, TASK_INTERRUPTIBLE, msecs_to_jiffies(1000)); -@@ -2235,6 +2270,33 @@ done: +@@ -2242,6 +2277,33 @@ done: BT_ERR("%s: Device boot timeout", hdev->name); return -ETIMEDOUT; } diff --git a/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch b/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch index e9b1f05f..276ba1be 100644 --- a/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch +++ b/patches/collateral-evolutions/network/0055-name_assign_type/brcmfmac.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c -@@ -2312,7 +2312,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s +@@ -2215,7 +2215,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s } strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1); |