From 90a5c5ee241c60f233fdb410d5be602c83bee338 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 7 Mar 2013 12:42:16 -0800 Subject: [PATCH] compat-drivers: refresh patches for next-20130307 Signed-off-by: Luis R. Rodriguez --- .../drm/04-revert-prime-support.patch | 4 ++-- .../network/0001-netdev_ops.patch | 8 ++++---- .../network/0002-net-misc.patch | 2 +- .../0003-netdev-needed_headroom_tailroom.patch | 4 ++-- .../collateral-evolutions/network/04-netns.patch | 12 ++++++------ .../network/08-rename-config-options.patch | 4 ++-- .../network/09-threaded-irq.patch | 10 +++++----- .../network/10-add-wext-handlers-to-netdev.patch | 2 +- .../network/14-device-type.patch | 2 +- .../network/16-bluetooth.patch | 4 ++-- .../network/17-netdev-queue.patch | 4 ++-- .../network/24-pcmcia.patch | 2 +- .../network/25-multicast-list_head.patch | 16 ++++++++-------- .../network/30-bridge-port.patch | 2 +- .../network/42-netlink_seq.patch | 2 +- .../network/46-use_other_workqueue.patch | 2 +- .../network/48-use_skb_get_queue_mapping.patch | 2 +- .../network/62-usb_driver_lpm.patch | 4 ++-- .../network/69-wowlan-no-socket.patch | 2 +- 19 files changed, 44 insertions(+), 44 deletions(-) diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch index b2ab4dc529cb..11cd8c954bf0 100644 --- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch +++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch @@ -282,7 +282,7 @@ not < 3.3.0. --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -1023,7 +1023,11 @@ static struct drm_driver driver = { +@@ -1025,7 +1025,11 @@ static struct drm_driver driver = { */ .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ @@ -294,7 +294,7 @@ not < 3.3.0. .load = i915_driver_load, .unload = i915_driver_unload, .open = i915_driver_open, -@@ -1046,10 +1050,12 @@ static struct drm_driver driver = { +@@ -1048,10 +1052,12 @@ static struct drm_driver driver = { .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops, diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch index 13b0ec92d9bc..049acb659bda 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch @@ -82,7 +82,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 wdev->netdev = ndev; --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3439,7 +3439,7 @@ static int rndis_wlan_bind(struct usbnet +@@ -3438,7 +3438,7 @@ static int rndis_wlan_bind(struct usbnet * rndis_host wants to avoid all OID as much as possible * so do promisc/multicast handling in rndis_wlan. */ @@ -234,7 +234,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1003,7 +1003,7 @@ static void ieee80211_if_setup(struct ne +@@ -1009,7 +1009,7 @@ static void ieee80211_if_setup(struct ne { ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; @@ -243,7 +243,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 dev->destructor = free_netdev; } -@@ -1166,7 +1166,7 @@ static void ieee80211_setup_sdata(struct +@@ -1172,7 +1172,7 @@ static void ieee80211_setup_sdata(struct /* only monitor/p2p-device differ */ if (sdata->dev) { @@ -252,7 +252,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 sdata->dev->type = ARPHRD_ETHER; } -@@ -1204,7 +1204,7 @@ static void ieee80211_setup_sdata(struct +@@ -1210,7 +1210,7 @@ static void ieee80211_setup_sdata(struct break; case NL80211_IFTYPE_MONITOR: sdata->dev->type = ARPHRD_IEEE80211_RADIOTAP; diff --git a/patches/collateral-evolutions/network/0002-net-misc.patch b/patches/collateral-evolutions/network/0002-net-misc.patch index b0618f218923..511f1b0e0a87 100644 --- a/patches/collateral-evolutions/network/0002-net-misc.patch +++ b/patches/collateral-evolutions/network/0002-net-misc.patch @@ -22,7 +22,7 @@ compile tested against older kernels. * For RX we handle drivers that zero-pad to end-of-packet. --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1004,6 +1004,11 @@ static void ieee80211_if_setup(struct ne +@@ -1010,6 +1010,11 @@ static void ieee80211_if_setup(struct ne ether_setup(dev); dev->priv_flags &= ~IFF_TX_SKB_SHARING; netdev_attach_ops(dev, &ieee80211_dataif_ops); diff --git a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch index f2debf330798..664d34454c13 100644 --- a/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch +++ b/patches/collateral-evolutions/network/0003-netdev-needed_headroom_tailroom.patch @@ -4,7 +4,7 @@ could be used. --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1504,6 +1504,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1510,6 +1510,7 @@ int ieee80211_if_add(struct ieee80211_lo return -ENOMEM; dev_net_set(ndev, wiphy_net(local->hw.wiphy)); @@ -12,7 +12,7 @@ could be used. ndev->needed_headroom = local->tx_headroom + 4*6 /* four MAC addresses */ + 2 + 2 + 2 + 2 /* ctl, dur, seq, qos */ -@@ -1512,6 +1513,7 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -1518,6 +1519,7 @@ int ieee80211_if_add(struct ieee80211_lo - ETH_HLEN /* ethernet hard_header_len */ + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; diff --git a/patches/collateral-evolutions/network/04-netns.patch b/patches/collateral-evolutions/network/04-netns.patch index 86c73d83c7ee..3bf80398a220 100644 --- a/patches/collateral-evolutions/network/04-netns.patch +++ b/patches/collateral-evolutions/network/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6349,7 +6349,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -6348,7 +6348,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); @@ -44,7 +44,7 @@ files... rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -852,8 +856,10 @@ static int cfg80211_netdev_notifier_call +@@ -851,8 +855,10 @@ static int cfg80211_netdev_notifier_call wdev->identifier = ++rdev->wdev_id; list_add_rcu(&wdev->list, &rdev->wdev_list); rdev->devlist_generation++; @@ -55,7 +55,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -1043,6 +1049,7 @@ static struct notifier_block cfg80211_ne +@@ -1042,6 +1048,7 @@ static struct notifier_block cfg80211_ne .notifier_call = cfg80211_netdev_notifier_call, }; @@ -63,7 +63,7 @@ files... static void __net_exit cfg80211_pernet_exit(struct net *net) { struct cfg80211_registered_device *rdev; -@@ -1060,14 +1067,17 @@ static void __net_exit cfg80211_pernet_e +@@ -1059,14 +1066,17 @@ static void __net_exit cfg80211_pernet_e static struct pernet_operations cfg80211_pernet_ops = { .exit = cfg80211_pernet_exit, }; @@ -81,7 +81,7 @@ files... err = wiphy_sysfs_init(); if (err) -@@ -1102,8 +1112,10 @@ out_fail_nl80211: +@@ -1101,8 +1111,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -92,7 +92,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -1115,7 +1127,9 @@ static void __exit cfg80211_exit(void) +@@ -1114,7 +1126,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/collateral-evolutions/network/08-rename-config-options.patch b/patches/collateral-evolutions/network/08-rename-config-options.patch index a13322744c50..56f40154a177 100644 --- a/patches/collateral-evolutions/network/08-rename-config-options.patch +++ b/patches/collateral-evolutions/network/08-rename-config-options.patch @@ -181,9 +181,9 @@ CONFIG_BT_HIDP does not build with older kernel versions. release_sock(sk); --- a/drivers/net/wireless/mwifiex/Makefile +++ b/drivers/net/wireless/mwifiex/Makefile -@@ -40,7 +40,7 @@ mwifiex-y += sta_rx.o - mwifiex-y += uap_txrx.o +@@ -41,7 +41,7 @@ mwifiex-y += uap_txrx.o mwifiex-y += cfg80211.o + mwifiex-y += ethtool.o mwifiex-$(CONFIG_DEBUG_FS) += debugfs.o -obj-$(CONFIG_MWIFIEX) += mwifiex.o +obj-$(CONFIG_COMPAT_MWIFIEX) += mwifiex.o diff --git a/patches/collateral-evolutions/network/09-threaded-irq.patch b/patches/collateral-evolutions/network/09-threaded-irq.patch index 05bc541be9bc..f83b8f3c5c21 100644 --- a/patches/collateral-evolutions/network/09-threaded-irq.patch +++ b/patches/collateral-evolutions/network/09-threaded-irq.patch @@ -6,7 +6,7 @@ thread in process context as well. --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -4239,8 +4239,13 @@ redo: +@@ -4244,8 +4244,13 @@ redo: if (b43_bus_host_is_sdio(dev->dev)) { b43_sdio_free_irq(dev); } else { @@ -20,7 +20,7 @@ thread in process context as well. } mutex_lock(&wl->mutex); dev = wl->current_dev; -@@ -4286,9 +4291,17 @@ static int b43_wireless_core_start(struc +@@ -4291,9 +4296,17 @@ static int b43_wireless_core_start(struc goto out; } } else { @@ -38,7 +38,7 @@ thread in process context as well. if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq); -@@ -5111,6 +5124,10 @@ static int b43_setup_bands(struct b43_wl +@@ -5116,6 +5129,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { @@ -51,7 +51,7 @@ thread in process context as well. b43_release_firmware(dev); --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h -@@ -864,6 +864,9 @@ struct b43_wldev { +@@ -870,6 +870,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif @@ -63,7 +63,7 @@ thread in process context as well. /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ --- a/drivers/net/wireless/iwlwifi/pcie/internal.h +++ b/drivers/net/wireless/iwlwifi/pcie/internal.h -@@ -295,6 +295,9 @@ struct iwl_trans_pcie { +@@ -311,6 +311,9 @@ struct iwl_trans_pcie { /*protect hw register */ spinlock_t reg_lock; diff --git a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch index ad1299c917e9..109711755b01 100644 --- a/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch +++ b/patches/collateral-evolutions/network/10-add-wext-handlers-to-netdev.patch @@ -29,7 +29,7 @@ CONFIG_WIRELESS_EXT in compat-drivers. device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -880,6 +876,15 @@ static int cfg80211_netdev_notifier_call +@@ -879,6 +875,15 @@ static int cfg80211_netdev_notifier_call wdev->sme_state = CFG80211_SME_IDLE; mutex_unlock(&rdev->devlist_mtx); #ifdef CONFIG_CFG80211_WEXT diff --git a/patches/collateral-evolutions/network/14-device-type.patch b/patches/collateral-evolutions/network/14-device-type.patch index 1676b632796c..580179cb6dc2 100644 --- a/patches/collateral-evolutions/network/14-device-type.patch +++ b/patches/collateral-evolutions/network/14-device-type.patch @@ -8,7 +8,7 @@ compile warning. --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -812,9 +812,11 @@ void cfg80211_unregister_wdev(struct wir +@@ -811,9 +811,11 @@ void cfg80211_unregister_wdev(struct wir } EXPORT_SYMBOL(cfg80211_unregister_wdev); diff --git a/patches/collateral-evolutions/network/16-bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth.patch index e75287fcc0eb..0c58f4d04080 100644 --- a/patches/collateral-evolutions/network/16-bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth.patch @@ -84,7 +84,7 @@ here still, but for now we keep this here. wake_up_process(session->task); --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -879,8 +879,13 @@ drop: +@@ -884,8 +884,13 @@ drop: goto done; } @@ -98,7 +98,7 @@ here still, but for now we keep this here. { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -1054,8 +1059,12 @@ static struct proto hci_sk_proto = { +@@ -1059,8 +1064,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; diff --git a/patches/collateral-evolutions/network/17-netdev-queue.patch b/patches/collateral-evolutions/network/17-netdev-queue.patch index 63e99e84d616..3ab9fc15bb4e 100644 --- a/patches/collateral-evolutions/network/17-netdev-queue.patch +++ b/patches/collateral-evolutions/network/17-netdev-queue.patch @@ -14,7 +14,7 @@ The patch that introduced this on mac80211 was: --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1627,6 +1627,7 @@ void ieee80211_sdata_stop(struct ieee802 +@@ -1633,6 +1633,7 @@ void ieee80211_sdata_stop(struct ieee802 * Remove all interfaces, may only be called at hardware unregistration * time because it doesn't do RCU-safe list removals. */ @@ -22,7 +22,7 @@ The patch that introduced this on mac80211 was: void ieee80211_remove_interfaces(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata, *tmp; -@@ -1654,6 +1655,22 @@ void ieee80211_remove_interfaces(struct +@@ -1660,6 +1661,22 @@ void ieee80211_remove_interfaces(struct kfree(sdata); } } diff --git a/patches/collateral-evolutions/network/24-pcmcia.patch b/patches/collateral-evolutions/network/24-pcmcia.patch index 3538eb7a75ee..d9a50742c1dd 100644 --- a/patches/collateral-evolutions/network/24-pcmcia.patch +++ b/patches/collateral-evolutions/network/24-pcmcia.patch @@ -1400,7 +1400,7 @@ .suspend = spectrum_cs_suspend, --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -519,7 +519,11 @@ static int ssb_devices_register(struct s +@@ -517,7 +517,11 @@ static int ssb_devices_register(struct s break; case SSB_BUSTYPE_PCMCIA: #ifdef CONFIG_SSB_PCMCIAHOST diff --git a/patches/collateral-evolutions/network/25-multicast-list_head.patch b/patches/collateral-evolutions/network/25-multicast-list_head.patch index c729d2031846..d85e7e4e5209 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head.patch +++ b/patches/collateral-evolutions/network/25-multicast-list_head.patch @@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2641,15 +2641,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2650,15 +2650,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2670,13 +2676,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2679,13 +2685,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -5009,7 +5029,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -5018,7 +5038,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 { struct mwl8k_cmd_pkt *cmd; -@@ -5020,7 +5044,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -5029,7 +5053,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (unsigned long)cmd; } -@@ -5142,7 +5170,11 @@ static void mwl8k_configure_filter(struc +@@ -5151,7 +5179,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); @@ -637,7 +637,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return hash.low | ((u64)hash.high << 32); --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c -@@ -102,7 +102,11 @@ static void _brcmf_set_multicast_list(st +@@ -103,7 +103,11 @@ static void _brcmf_set_multicast_list(st netdev_for_each_mc_addr(ha, ndev) { if (!cnt) break; @@ -727,7 +727,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -741,8 +741,13 @@ static void ieee80211_do_stop(struct iee +@@ -744,8 +744,13 @@ static void ieee80211_do_stop(struct iee if (sdata->dev) { netif_addr_lock_bh(sdata->dev); spin_lock_bh(&local->filter_lock); @@ -741,7 +741,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); netif_addr_unlock_bh(sdata->dev); -@@ -916,7 +921,12 @@ static void ieee80211_set_multicast_list +@@ -922,7 +927,12 @@ static void ieee80211_set_multicast_list sdata->flags ^= IEEE80211_SDATA_PROMISC; } spin_lock_bh(&local->filter_lock); diff --git a/patches/collateral-evolutions/network/30-bridge-port.patch b/patches/collateral-evolutions/network/30-bridge-port.patch index 7bd7a12e8ec6..b42d81e8718e 100644 --- a/patches/collateral-evolutions/network/30-bridge-port.patch +++ b/patches/collateral-evolutions/network/30-bridge-port.patch @@ -34,7 +34,7 @@ compat-drivers. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -2014,7 +2014,7 @@ static int nl80211_valid_4addr(struct cf +@@ -2013,7 +2013,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/collateral-evolutions/network/42-netlink_seq.patch b/patches/collateral-evolutions/network/42-netlink_seq.patch index 0ce2f827a37c..efb44f9033b2 100644 --- a/patches/collateral-evolutions/network/42-netlink_seq.patch +++ b/patches/collateral-evolutions/network/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5309,7 +5309,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -5308,7 +5308,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/46-use_other_workqueue.patch b/patches/collateral-evolutions/network/46-use_other_workqueue.patch index 91e505551fa8..4f5ba875875e 100644 --- a/patches/collateral-evolutions/network/46-use_other_workqueue.patch +++ b/patches/collateral-evolutions/network/46-use_other_workqueue.patch @@ -4,7 +4,7 @@ position before. --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c -@@ -1789,16 +1789,24 @@ int hci_register_dev(struct hci_dev *hde +@@ -2066,16 +2066,24 @@ int hci_register_dev(struct hci_dev *hde list_add(&hdev->list, &hci_dev_list); write_unlock(&hci_dev_list_lock); diff --git a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch index 5ed233bac4d6..33b934046831 100644 --- a/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch +++ b/patches/collateral-evolutions/network/48-use_skb_get_queue_mapping.patch @@ -4,7 +4,7 @@ function always returns something. --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -3452,11 +3452,11 @@ static void b43_op_tx(struct ieee80211_h +@@ -3457,11 +3457,11 @@ static void b43_op_tx(struct ieee80211_h } B43_WARN_ON(skb_shinfo(skb)->nr_frags); diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch index c28096a252b3..05b8d6e96741 100644 --- a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch +++ b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch @@ -132,7 +132,7 @@ module_usb_driver(carl9170_driver); --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c -@@ -1499,7 +1499,9 @@ static struct usb_driver brcmf_usbdrvr = +@@ -1498,7 +1498,9 @@ static struct usb_driver brcmf_usbdrvr = .resume = brcmf_usb_resume, .reset_resume = brcmf_usb_reset_resume, .supports_autosuspend = 1, @@ -192,7 +192,7 @@ module_usb_driver(p54u_driver); --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3758,7 +3758,9 @@ static struct usb_driver rndis_wlan_driv +@@ -3757,7 +3757,9 @@ static struct usb_driver rndis_wlan_driv .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, diff --git a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch index 54d66f69c2d4..868dff2ba7b3 100644 --- a/patches/collateral-evolutions/network/69-wowlan-no-socket.patch +++ b/patches/collateral-evolutions/network/69-wowlan-no-socket.patch @@ -2,7 +2,7 @@ __sock_create() is not available on kernel version < 2.6.37. --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -7333,7 +7333,7 @@ static int nl80211_parse_wowlan_tcp(stru +@@ -7332,7 +7332,7 @@ static int nl80211_parse_wowlan_tcp(stru port = nla_get_u16(tb[NL80211_WOWLAN_TCP_SRC_PORT]); else port = 0; -- 2.30.2