diff options
Diffstat (limited to 'patches/collateral-evolutions/network')
7 files changed, 44 insertions, 28 deletions
diff --git a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch index 742def52..5619afe5 100644 --- a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6628,7 +6628,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -6638,7 +6638,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch index dd0de8f9..7e9b68b6 100644 --- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch +++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1276,6 +1276,9 @@ struct ieee80211_local { +@@ -1288,6 +1288,9 @@ struct ieee80211_local { u32 dot11TransmittedFrameCount; #ifdef CONFIG_MAC80211_LEDS diff --git a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch index 6d556b97..61c49f6d 100644 --- a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch +++ b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1251,6 +1251,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1250,6 +1250,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); /*-------------------------------------------------------------------------*/ @@ -8,7 +8,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; -@@ -1283,6 +1284,12 @@ static int build_dma_sg(const struct sk_ +@@ -1282,6 +1283,12 @@ static int build_dma_sg(const struct sk_ return 1; } @@ -21,7 +21,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) -@@ -1339,12 +1346,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1338,12 +1345,19 @@ netdev_tx_t usbnet_start_xmit (struct sk if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; @@ -41,7 +41,7 @@ } } else urb->transfer_flags |= URB_ZERO_PACKET; -@@ -1399,7 +1413,9 @@ not_drop: +@@ -1410,7 +1424,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1452,7 +1468,9 @@ static void usbnet_bh (unsigned long par +@@ -1463,7 +1479,9 @@ static void usbnet_bh (unsigned long par rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ case rx_cleanup: usb_free_urb (entry->urb); dev_kfree_skb (skb); -@@ -1808,7 +1826,9 @@ int usbnet_resume (struct usb_interface +@@ -1819,7 +1837,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); diff --git a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch index 9f87acb1..0383c30e 100644 --- a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch +++ b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch @@ -9,7 +9,7 @@ [HWSIM_MCGRP_CONFIG] = { .name = "config", }, }; -@@ -2942,7 +2942,7 @@ done: +@@ -2945,7 +2945,7 @@ done: } /* Generic Netlink operations array */ diff --git a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch index eb822b70..96870a7f 100644 --- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch @@ -21,7 +21,7 @@ [NL80211_MCGRP_CONFIG] = { .name = NL80211_MULTICAST_GROUP_CONFIG }, [NL80211_MCGRP_SCAN] = { .name = NL80211_MULTICAST_GROUP_SCAN }, [NL80211_MCGRP_REGULATORY] = { .name = NL80211_MULTICAST_GROUP_REG }, -@@ -10168,7 +10168,7 @@ static int nl80211_tdls_cancel_channel_s +@@ -10178,7 +10178,7 @@ static int nl80211_tdls_cancel_channel_s NL80211_FLAG_CHECK_NETDEV_UP) #define NL80211_FLAG_CLEAR_SKB 0x20 @@ -30,7 +30,7 @@ struct genl_info *info) { struct cfg80211_registered_device *rdev; -@@ -10237,7 +10237,7 @@ static int nl80211_pre_doit(const struct +@@ -10247,7 +10247,7 @@ static int nl80211_pre_doit(const struct return 0; } @@ -39,7 +39,7 @@ struct genl_info *info) { if (info->user_ptr[1]) { -@@ -10266,7 +10266,7 @@ static void nl80211_post_doit(const stru +@@ -10276,7 +10276,7 @@ static void nl80211_post_doit(const stru } } 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; 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 e4b5b28e..bd57e827 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,22 @@ --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -1806,8 +1806,12 @@ static int btusb_recv_event_intel(struct +@@ -339,6 +339,7 @@ + int (*recv_bulk)(struct btusb_data *data, void *buffer, int count); + }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) + static int btusb_wait_on_bit_timeout(void *word, int bit, unsigned long timeout, + unsigned mode) + { +@@ -348,6 +349,7 @@ + return out_of_line_wait_on_bit_timeout(word, bit, bit_wait_timeout, + mode, timeout); + } ++#endif + + static inline void btusb_free_frags(struct btusb_data *data) + { +@@ -1816,8 +1816,12 @@ static int btusb_recv_event_intel(struct if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) && test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { @@ -13,7 +29,7 @@ } } -@@ -1818,8 +1822,12 @@ static int btusb_recv_event_intel(struct +@@ -1828,8 +1832,12 @@ static int btusb_recv_event_intel(struct if (skb->len == 9 && hdr->evt == 0xff && hdr->plen == 0x07 && skb->data[2] == 0x02) { if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { @@ -26,15 +42,15 @@ } } } -@@ -2187,6 +2195,7 @@ static int btusb_setup_intel_new(struct +@@ -2197,6 +2205,7 @@ static int btusb_setup_intel_new(struct * and thus just timeout if that happens and fail the setup * of this device. */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING, - TASK_INTERRUPTIBLE, - msecs_to_jiffies(5000)); -@@ -2201,6 +2210,31 @@ static int btusb_setup_intel_new(struct + err = btusb_wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING, + msecs_to_jiffies(5000), + TASK_INTERRUPTIBLE); +@@ -2211,6 +2220,31 @@ static int btusb_setup_intel_new(struct err = -ETIMEDOUT; goto done; } @@ -66,15 +82,15 @@ if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) { BT_ERR("%s: Firmware loading failed", hdev->name); -@@ -2240,6 +2274,7 @@ done: +@@ -2250,6 +2284,7 @@ done: */ BT_INFO("%s: Waiting for device to boot", hdev->name); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, - TASK_INTERRUPTIBLE, - msecs_to_jiffies(1000)); -@@ -2253,6 +2288,33 @@ done: + err = btusb_wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, + msecs_to_jiffies(1000), + TASK_INTERRUPTIBLE); +@@ -2263,6 +2298,33 @@ done: BT_ERR("%s: Device boot timeout", hdev->name); return -ETIMEDOUT; } |