From d90d458f267e7084a0f28409945d98c3d848a94c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 10 Feb 2012 12:56:34 -0800 Subject: [PATCH] compat-wireless: refresh patches with next-20120210 Synchs with next-20120210 Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 10 +++---- patches/04-netns.patch | 2 +- patches/08-rename-config-options.patch | 2 +- patches/09-cfg80211-wext-padding.patch | 2 +- patches/11-dev-pm-ops.patch | 18 ++++++------- patches/12-iw_handler-changes.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/24-pcmcia.patch | 10 +++---- patches/25-multicast-list_head.patch | 18 ++++++------- patches/26-sdio-quirks.patch | 2 +- patches/29-sdio_no_suspend.patch | 26 +++++++++---------- patches/36-workqueue.patch | 2 +- patches/38-led-max-brightness.patch | 2 +- patches/39-remove_blink_set.patch | 6 ++--- patches/42-netlink_seq.patch | 2 +- .../47-no_trans_start_on_netdev_queue.patch | 2 +- 16 files changed, 54 insertions(+), 54 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 0c99940fca80..e66bcd4c197d 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -23,7 +23,7 @@ without creating a headache on maintenance of the pathes. if (unlikely(retval < 0)) { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1377,7 +1377,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1375,7 +1375,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif @@ -34,7 +34,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c -@@ -1029,7 +1029,7 @@ static struct net_device_ops ath6kl_netd +@@ -1175,7 +1175,7 @@ static const struct net_device_ops ath6k void init_netdev(struct net_device *dev) { @@ -107,7 +107,7 @@ without creating a headache on maintenance of the pathes. if (ret < 0) --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c -@@ -2160,7 +2160,7 @@ static int __devinit b44_init_one(struct +@@ -2159,7 +2159,7 @@ static int __devinit b44_init_one(struct bp->rx_pending = B44_DEF_RX_RING_PENDING; bp->tx_pending = B44_DEF_TX_RING_PENDING; @@ -186,7 +186,7 @@ without creating a headache on maintenance of the pathes. --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6115,7 +6115,7 @@ static struct net_device *ipw2100_alloc_ +@@ -6112,7 +6112,7 @@ static struct net_device *ipw2100_alloc_ priv->ieee->perfect_rssi = -20; priv->ieee->worst_rssi = -85; @@ -289,7 +289,7 @@ without creating a headache on maintenance of the pathes. priv->media_connected = false; --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c -@@ -2272,14 +2272,18 @@ int orinoco_if_add(struct orinoco_privat +@@ -2270,14 +2270,18 @@ int orinoco_if_add(struct orinoco_privat #endif /* Default to standard ops if not set */ if (ops) diff --git a/patches/04-netns.patch b/patches/04-netns.patch index b2fd677b86da..5ab4334e2207 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -5163,7 +5163,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -5165,7 +5165,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); diff --git a/patches/08-rename-config-options.patch b/patches/08-rename-config-options.patch index a81b7ac0c5ae..59aef76342b7 100644 --- a/patches/08-rename-config-options.patch +++ b/patches/08-rename-config-options.patch @@ -35,7 +35,7 @@ CONFIG_BT_HIDP does not build with older kernel versions. --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h -@@ -1412,7 +1412,7 @@ struct il_priv { +@@ -1379,7 +1379,7 @@ struct il_priv { } _3945; #endif diff --git a/patches/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch index 587063ec8b0c..93de568a1fe6 100644 --- a/patches/09-cfg80211-wext-padding.patch +++ b/patches/09-cfg80211-wext-padding.patch @@ -30,7 +30,7 @@ moved due to struct enlargements. --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -1998,6 +1998,9 @@ struct wiphy_wowlan_support { +@@ -1999,6 +1999,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 9acf1933193b..05d2833da408 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -35,7 +35,7 @@ calls on compat code with only slight modifications. int __init bcma_host_pci_init(void) --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2900,6 +2900,9 @@ static struct pci_error_handlers atl1c_e +@@ -2899,6 +2899,9 @@ static struct pci_error_handlers atl1c_e static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); @@ -45,7 +45,7 @@ calls on compat code with only slight modifications. static struct pci_driver atl1c_driver = { .name = atl1c_driver_name, .id_table = atl1c_pci_tbl, -@@ -2907,7 +2910,12 @@ static struct pci_driver atl1c_driver = +@@ -2906,7 +2909,12 @@ static struct pci_driver atl1c_driver = .remove = __devexit_p(atl1c_remove), .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, @@ -144,7 +144,7 @@ calls on compat code with only slight modifications. int ath_pci_init(void) --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c -@@ -3919,7 +3919,12 @@ static struct pci_driver il3945_driver = +@@ -3885,7 +3885,12 @@ static struct pci_driver il3945_driver = .id_table = il3945_hw_card_ids, .probe = il3945_pci_probe, .remove = __devexit_p(il3945_pci_remove), @@ -159,7 +159,7 @@ calls on compat code with only slight modifications. static int __init --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c -@@ -6457,7 +6457,12 @@ static struct pci_driver il4965_driver = +@@ -6479,7 +6479,12 @@ static struct pci_driver il4965_driver = .id_table = il4965_hw_card_ids, .probe = il4965_pci_probe, .remove = __devexit_p(il4965_pci_remove), @@ -174,7 +174,7 @@ calls on compat code with only slight modifications. static int __init --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c -@@ -5239,15 +5239,17 @@ il_pci_resume(struct device *device) +@@ -5123,15 +5123,17 @@ il_pci_resume(struct device *device) } EXPORT_SYMBOL(il_pci_resume); @@ -202,7 +202,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h -@@ -2028,7 +2028,12 @@ __le32 il_add_beacon_time(struct il_priv +@@ -1964,7 +1964,12 @@ __le32 il_add_beacon_time(struct il_priv #ifdef CONFIG_PM int il_pci_suspend(struct device *device); int il_pci_resume(struct device *device); @@ -217,7 +217,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c -@@ -528,6 +528,9 @@ static int iwl_pci_resume(struct device +@@ -367,6 +367,9 @@ static int iwl_pci_resume(struct device static SIMPLE_DEV_PM_OPS(iwl_dev_pm_ops, iwl_pci_suspend, iwl_pci_resume); @@ -227,7 +227,7 @@ calls on compat code with only slight modifications. #define IWL_PM_OPS (&iwl_dev_pm_ops) #else -@@ -541,7 +544,12 @@ static struct pci_driver iwl_pci_driver +@@ -380,7 +383,12 @@ static struct pci_driver iwl_pci_driver .id_table = iwl_hw_card_ids, .probe = iwl_pci_probe, .remove = __devexit_p(iwl_pci_remove), @@ -336,7 +336,7 @@ calls on compat code with only slight modifications. /* add global spin lock to solve the problem that --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c -@@ -435,21 +435,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -432,21 +432,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); diff --git a/patches/12-iw_handler-changes.patch b/patches/12-iw_handler-changes.patch index e8d00b36d5a6..1b9154bf5891 100644 --- a/patches/12-iw_handler-changes.patch +++ b/patches/12-iw_handler-changes.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c -@@ -6118,7 +6118,11 @@ static struct net_device *ipw2100_alloc_ +@@ -6115,7 +6115,11 @@ static struct net_device *ipw2100_alloc_ netdev_attach_ops(dev, &ipw2100_netdev_ops); dev->ethtool_ops = &ipw2100_ethtool_ops; dev->wireless_handlers = &ipw2100_wx_handler_def; diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 490fb349b5fe..b4d871b1306d 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -3115,7 +3115,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3117,7 +3117,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch index bbd3af98b8eb..35ed813496a3 100644 --- a/patches/24-pcmcia.patch +++ b/patches/24-pcmcia.patch @@ -895,7 +895,7 @@ } static int if_cs_probe(struct pcmcia_device *p_dev) -@@ -822,7 +856,16 @@ static int if_cs_probe(struct pcmcia_dev +@@ -821,7 +855,16 @@ static int if_cs_probe(struct pcmcia_dev card->p_dev = p_dev; p_dev->priv = card; @@ -912,7 +912,7 @@ if (pcmcia_loop_config(p_dev, if_cs_ioprobe, NULL)) { pr_err("error in pcmcia_loop_config\n"); -@@ -834,12 +877,26 @@ static int if_cs_probe(struct pcmcia_dev +@@ -833,12 +876,26 @@ static int if_cs_probe(struct pcmcia_dev * a handler to the interrupt, unless the 'Handler' member of * the irq structure is initialized. */ @@ -939,7 +939,7 @@ if (!card->iobase) { pr_err("error in ioport_map\n"); ret = -EIO; -@@ -853,7 +910,17 @@ static int if_cs_probe(struct pcmcia_dev +@@ -852,7 +909,17 @@ static int if_cs_probe(struct pcmcia_dev } /* Finally, report what we've done */ @@ -957,7 +957,7 @@ /* * Most of the libertas cards can do unaligned register access, but some -@@ -922,7 +989,11 @@ static int if_cs_probe(struct pcmcia_dev +@@ -921,7 +988,11 @@ static int if_cs_probe(struct pcmcia_dev priv->fw_ready = 1; /* Now actually get the IRQ */ @@ -969,7 +969,7 @@ IRQF_SHARED, DRV_NAME, card); if (ret) { pr_err("error in request_irq\n"); -@@ -995,7 +1066,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids); +@@ -994,7 +1065,13 @@ MODULE_DEVICE_TABLE(pcmcia, if_cs_ids); static struct pcmcia_driver lbs_driver = { .owner = THIS_MODULE, diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 4c7bd9355f2b..d6423794e839 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/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 -@@ -2563,15 +2563,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2564,15 +2564,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; -@@ -2592,13 +2598,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2593,13 +2599,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 } } -@@ -4803,7 +4823,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -4823,7 +4843,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; -@@ -4814,7 +4838,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -4834,7 +4858,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; } -@@ -4936,7 +4964,11 @@ static void mwl8k_configure_filter(struc +@@ -4956,7 +4984,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); @@ -600,7 +600,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (u64)(unsigned long)fp; --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c -@@ -1195,17 +1195,34 @@ static void zd_process_intr(struct work_ +@@ -1203,17 +1203,34 @@ static void zd_process_intr(struct work_ static u64 zd_op_prepare_multicast(struct ieee80211_hw *hw, @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2151,7 +2151,11 @@ struct ieee80211_ops { +@@ -2182,7 +2182,11 @@ struct ieee80211_ops { enum ieee80211_tx_sync_type type); u64 (*prepare_multicast)(struct ieee80211_hw *hw, @@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -802,7 +802,12 @@ struct ieee80211_local { +@@ -811,7 +811,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ @@ -768,7 +768,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -605,9 +609,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -600,9 +604,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( wiphy->ht_capa_mod_mask = &mac80211_ht_capa_mod_mask; INIT_LIST_HEAD(&local->interfaces); diff --git a/patches/26-sdio-quirks.patch b/patches/26-sdio-quirks.patch index 5d0e643d9b9f..4c1ffb55a32b 100644 --- a/patches/26-sdio-quirks.patch +++ b/patches/26-sdio-quirks.patch @@ -20,7 +20,7 @@ The quirks attribute is not available on older kernels. if (ret) --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -77,7 +77,9 @@ mwifiex_sdio_probe(struct sdio_func *fun +@@ -75,7 +75,9 @@ mwifiex_sdio_probe(struct sdio_func *fun card->func = func; diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index e7f2c8601717..9d9f8fcd80bb 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -5,16 +5,16 @@ suspend and resume that are not backported. --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c -@@ -1963,7 +1963,7 @@ int ath6kl_cfg80211_resume(struct ath6kl - return 0; +@@ -2152,7 +2152,7 @@ int ath6kl_cfg80211_resume(struct ath6kl } + EXPORT_SYMBOL(ath6kl_cfg80211_resume); -#ifdef CONFIG_PM +#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) /* hif layer decides what suspend mode to use */ static int __ath6kl_cfg80211_suspend(struct wiphy *wiphy, -@@ -2554,7 +2554,7 @@ static struct cfg80211_ops ath6kl_cfg802 +@@ -2778,7 +2778,7 @@ static struct cfg80211_ops ath6kl_cfg802 .del_pmksa = ath6kl_del_pmksa, .flush_pmksa = ath6kl_flush_pmksa, CFG80211_TESTMODE_CMD(ath6kl_tm_cmd) @@ -58,7 +58,7 @@ suspend and resume that are not backported. { --- a/drivers/net/wireless/ath/ath6kl/sdio.c +++ b/drivers/net/wireless/ath/ath6kl/sdio.c -@@ -782,6 +782,7 @@ out: +@@ -808,6 +808,7 @@ static int ath6kl_set_sdio_pm_caps(struc return ret; } @@ -66,7 +66,7 @@ suspend and resume that are not backported. static int ath6kl_sdio_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow) { struct ath6kl_sdio *ar_sdio = ath6kl_sdio_priv(ar); -@@ -877,6 +878,7 @@ static int ath6kl_sdio_resume(struct ath +@@ -909,6 +910,7 @@ static int ath6kl_sdio_resume(struct ath return 0; } @@ -74,7 +74,7 @@ suspend and resume that are not backported. /* set the window address register (using 4-byte register access ). */ static int ath6kl_set_addrwin_reg(struct ath6kl *ar, u32 reg_addr, u32 addr) -@@ -1178,8 +1180,10 @@ static const struct ath6kl_hif_ops ath6k +@@ -1210,8 +1212,10 @@ static const struct ath6kl_hif_ops ath6k .enable_scatter = ath6kl_sdio_enable_scatter, .scat_req_rw = ath6kl_sdio_async_rw_scatter, .cleanup_scatter = ath6kl_sdio_cleanup_scatter, @@ -85,7 +85,7 @@ suspend and resume that are not backported. .diag_read32 = ath6kl_sdio_diag_read32, .diag_write32 = ath6kl_sdio_diag_write32, .bmi_read = ath6kl_sdio_bmi_read, -@@ -1189,7 +1193,7 @@ static const struct ath6kl_hif_ops ath6k +@@ -1221,7 +1225,7 @@ static const struct ath6kl_hif_ops ath6k .stop = ath6kl_sdio_stop, }; @@ -94,7 +94,7 @@ suspend and resume that are not backported. /* * Empty handlers so that mmc subsystem doesn't remove us entirely during -@@ -1336,7 +1340,9 @@ static struct sdio_driver ath6kl_sdio_dr +@@ -1370,7 +1374,9 @@ static struct sdio_driver ath6kl_sdio_dr .id_table = ath6kl_sdio_devices, .probe = ath6kl_sdio_probe, .remove = ath6kl_sdio_remove, @@ -135,7 +135,7 @@ suspend and resume that are not backported. /*******************************************************************/ --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c -@@ -127,8 +127,10 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -125,8 +125,10 @@ mwifiex_sdio_remove(struct sdio_func *fu return; if (user_rmmod) { @@ -146,7 +146,7 @@ suspend and resume that are not backported. for (i = 0; i < adapter->priv_num; i++) if ((GET_BSS_ROLE(adapter->priv[i]) == -@@ -148,6 +150,7 @@ mwifiex_sdio_remove(struct sdio_func *fu +@@ -146,6 +148,7 @@ mwifiex_sdio_remove(struct sdio_func *fu kfree(card); } @@ -154,7 +154,7 @@ suspend and resume that are not backported. /* * SDIO suspend. * -@@ -255,6 +258,7 @@ static int mwifiex_sdio_resume(struct de +@@ -253,6 +256,7 @@ static int mwifiex_sdio_resume(struct de return 0; } @@ -162,7 +162,7 @@ suspend and resume that are not backported. /* Device ID for SD8787 */ #define SDIO_DEVICE_ID_MARVELL_8787 (0x9119) -@@ -270,10 +274,12 @@ static const struct sdio_device_id mwifi +@@ -268,10 +272,12 @@ static const struct sdio_device_id mwifi MODULE_DEVICE_TABLE(sdio, mwifiex_ids); @@ -175,7 +175,7 @@ suspend and resume that are not backported. static struct sdio_driver mwifiex_sdio = { .name = "mwifiex_sdio", -@@ -282,7 +288,9 @@ static struct sdio_driver mwifiex_sdio = +@@ -280,7 +286,9 @@ static struct sdio_driver mwifiex_sdio = .remove = mwifiex_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch index 62c4181c52e3..3e3df865f8f2 100644 --- a/patches/36-workqueue.patch +++ b/patches/36-workqueue.patch @@ -3,7 +3,7 @@ The rest is backported in include/linux/compat-2.6.37.h --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -1104,6 +1104,10 @@ static void __exit ieee80211_exit(void) +@@ -1102,6 +1102,10 @@ static void __exit ieee80211_exit(void) rc80211_minstrel_ht_exit(); rc80211_minstrel_exit(); diff --git a/patches/38-led-max-brightness.patch b/patches/38-led-max-brightness.patch index 57254352b479..487124fa4676 100644 --- a/patches/38-led-max-brightness.patch +++ b/patches/38-led-max-brightness.patch @@ -12,7 +12,7 @@ case IL_LED_DEFAULT: --- a/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-led.c -@@ -188,7 +188,9 @@ void iwl_leds_init(struct iwl_priv *priv +@@ -189,7 +189,9 @@ void iwl_leds_init(struct iwl_priv *priv wiphy_name(priv->hw->wiphy)); priv->led.brightness_set = iwl_led_brightness_set; priv->led.blink_set = iwl_led_blink_set; diff --git a/patches/39-remove_blink_set.patch b/patches/39-remove_blink_set.patch index 3a79e7413d1e..b85772a9ea80 100644 --- a/patches/39-remove_blink_set.patch +++ b/patches/39-remove_blink_set.patch @@ -28,7 +28,7 @@ #endif --- a/drivers/net/wireless/iwlwifi/iwl-led.c +++ b/drivers/net/wireless/iwlwifi/iwl-led.c -@@ -163,6 +163,7 @@ static void iwl_led_brightness_set(struc +@@ -164,6 +164,7 @@ static void iwl_led_brightness_set(struc iwl_led_cmd(priv, on, 0); } @@ -36,7 +36,7 @@ static int iwl_led_blink_set(struct led_classdev *led_cdev, unsigned long *delay_on, unsigned long *delay_off) -@@ -171,6 +172,7 @@ static int iwl_led_blink_set(struct led_ +@@ -172,6 +173,7 @@ static int iwl_led_blink_set(struct led_ return iwl_led_cmd(priv, *delay_on, *delay_off); } @@ -44,7 +44,7 @@ void iwl_leds_init(struct iwl_priv *priv) { -@@ -187,7 +189,9 @@ void iwl_leds_init(struct iwl_priv *priv +@@ -188,7 +190,9 @@ void iwl_leds_init(struct iwl_priv *priv priv->led.name = kasprintf(GFP_KERNEL, "%s-led", wiphy_name(priv->hw->wiphy)); priv->led.brightness_set = iwl_led_brightness_set; diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch index 520522fc55b2..ccc470cc18c3 100644 --- a/patches/42-netlink_seq.patch +++ b/patches/42-netlink_seq.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -4182,7 +4182,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -4175,7 +4175,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/47-no_trans_start_on_netdev_queue.patch b/patches/47-no_trans_start_on_netdev_queue.patch index c259662b2a55..cede89479b7d 100644 --- a/patches/47-no_trans_start_on_netdev_queue.patch +++ b/patches/47-no_trans_start_on_netdev_queue.patch @@ -4,7 +4,7 @@ on older kernels. --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c -@@ -289,8 +289,10 @@ void mwifiex_set_trans_start(struct net_ +@@ -290,8 +290,10 @@ void mwifiex_set_trans_start(struct net_ { int i; -- 2.30.2