From 15750d13571bb458c9c4480353f15e286fcd74bc Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 31 Jan 2012 16:08:46 -0800 Subject: [PATCH] compat-wireless: refresh patches This applies on top of next-20120131. Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 2 +- patches/04-netns.patch | 2 +- patches/05-usb.patch | 2 +- patches/06-header-changes.patch | 8 ++++---- patches/09-cfg80211-wext-padding.patch | 2 +- patches/09-threaded-irq.patch | 12 ++++++------ patches/11-dev-pm-ops.patch | 6 +++--- patches/12-mac80211-disable-tx-status.patch | 4 ++-- patches/15-symbol-export-conflicts.patch | 2 +- patches/17-netdev-queue.patch | 4 ++-- patches/22-multiqueue.patch | 4 ++-- patches/24-pcmcia.patch | 2 +- patches/25-multicast-list_head.patch | 18 +++++++++--------- patches/29-sdio_no_suspend.patch | 8 ++++---- patches/30-bridge-port.patch | 2 +- patches/36-workqueue.patch | 2 +- patches/38-led-max-brightness.patch | 2 +- patches/39-remove_blink_set.patch | 2 +- patches/42-netlink_seq.patch | 2 +- patches/45-remove-platform-id-table.patch | 2 +- patches/48-use_skb_get_queue_mapping.patch | 2 +- 21 files changed, 45 insertions(+), 45 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index c94bb8632157..0c99940fca80 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -278,7 +278,7 @@ without creating a headache on maintenance of the pathes. dev->tx_queue_len = 0; --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -580,7 +580,7 @@ static const struct net_device_ops mwifi +@@ -581,7 +581,7 @@ static const struct net_device_ops mwifi void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 4f7f94eea89e..b2fd677b86da 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 -@@ -5160,7 +5160,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -5163,7 +5163,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/05-usb.patch b/patches/05-usb.patch index 246d6fd4ea4b..463f4bda9871 100644 --- a/patches/05-usb.patch +++ b/patches/05-usb.patch @@ -14,7 +14,7 @@ USB opt soft_unbid was added as of 2.6.27. module_usb_driver(p54u_driver); --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1311,7 +1311,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1355,7 +1355,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids, diff --git a/patches/06-header-changes.patch b/patches/06-header-changes.patch index d90fb06bcb53..15355d5677ed 100644 --- a/patches/06-header-changes.patch +++ b/patches/06-header-changes.patch @@ -18,14 +18,14 @@ cases. --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c -@@ -30,6 +30,7 @@ - #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +@@ -36,6 +36,7 @@ + #include "regd.h" #include +#include #include - #include "wifi.h" - #include "rc.h" + + /* --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/wl1251/main.c @@ -24,6 +24,9 @@ diff --git a/patches/09-cfg80211-wext-padding.patch b/patches/09-cfg80211-wext-padding.patch index 76b817484831..587063ec8b0c 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 -@@ -1990,6 +1990,9 @@ struct wiphy_wowlan_support { +@@ -1998,6 +1998,9 @@ struct wiphy_wowlan_support { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 13f1912996d1..033f0282c6e7 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/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 -@@ -4201,8 +4201,13 @@ redo: +@@ -4178,8 +4178,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; -@@ -4244,9 +4249,17 @@ static int b43_wireless_core_start(struc +@@ -4221,9 +4226,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); -@@ -5038,6 +5051,10 @@ static int b43_setup_bands(struct b43_wl +@@ -5011,6 +5024,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { @@ -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/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -5180,14 +5180,25 @@ static int __devinit wl12xx_probe(struct +@@ -5181,14 +5181,25 @@ static int __devinit wl12xx_probe(struct platform_set_drvdata(pdev, wl); @@ -89,7 +89,7 @@ thread in process context as well. if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_hw; -@@ -5241,7 +5252,11 @@ out_bt_coex_state: +@@ -5242,7 +5253,11 @@ out_bt_coex_state: device_remove_file(wl->dev, &dev_attr_bt_coex_state); out_irq: @@ -101,7 +101,7 @@ thread in process context as well. out_free_hw: wl1271_free_hw(wl); -@@ -5259,7 +5274,12 @@ static int __devexit wl12xx_remove(struc +@@ -5260,7 +5275,12 @@ static int __devexit wl12xx_remove(struc disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 6dd3e6c3f014..9acf1933193b 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -270,7 +270,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -@@ -381,21 +381,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -372,21 +372,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)"); @@ -303,7 +303,7 @@ calls on compat code with only slight modifications. static int __init rtl92ce_module_init(void) --- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c -@@ -391,21 +391,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -384,21 +384,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)"); @@ -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 -@@ -403,21 +403,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -435,21 +435,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-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch index 6ee16bd9ed01..2de1996ab6d8 100644 --- a/patches/12-mac80211-disable-tx-status.patch +++ b/patches/12-mac80211-disable-tx-status.patch @@ -6,7 +6,7 @@ So we need to just ifdef this part out. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1949,6 +1949,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1944,6 +1944,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail; } @@ -14,7 +14,7 @@ So we need to just ifdef this part out. if (unlikely(!multicast && skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { struct sk_buff *orig_skb = skb; -@@ -1987,6 +1988,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1982,6 +1983,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 58726a166524..490fb349b5fe 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 -@@ -3121,7 +3121,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3115,7 +3115,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/17-netdev-queue.patch b/patches/17-netdev-queue.patch index cd029c7e8d03..65546855bb4b 100644 --- a/patches/17-netdev-queue.patch +++ b/patches/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 -@@ -1237,6 +1237,7 @@ void ieee80211_if_remove(struct ieee8021 +@@ -1244,6 +1244,7 @@ void ieee80211_if_remove(struct ieee8021 * 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; -@@ -1257,6 +1258,22 @@ void ieee80211_remove_interfaces(struct +@@ -1264,6 +1265,22 @@ void ieee80211_remove_interfaces(struct unregister_netdevice_many(&unreg_list); list_del(&unreg_list); } diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index bf12c4b8aa55..0860f9e6241a 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -96,7 +96,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1469,6 +1469,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1464,6 +1464,10 @@ void ieee80211_xmit(struct ieee80211_sub return; } @@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() ieee80211_set_qos_hdr(sdata, skb); ieee80211_tx(sdata, skb, false); rcu_read_unlock(); -@@ -2204,7 +2208,14 @@ void ieee80211_tx_pending(unsigned long +@@ -2199,7 +2203,14 @@ void ieee80211_tx_pending(unsigned long if (skb_queue_empty(&local->pending[i])) list_for_each_entry_rcu(sdata, &local->interfaces, list) diff --git a/patches/24-pcmcia.patch b/patches/24-pcmcia.patch index d55a7f107191..bbd3af98b8eb 100644 --- a/patches/24-pcmcia.patch +++ b/patches/24-pcmcia.patch @@ -1387,7 +1387,7 @@ .suspend = spectrum_cs_suspend, --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c -@@ -520,7 +520,11 @@ static int ssb_devices_register(struct s +@@ -504,7 +504,11 @@ static int ssb_devices_register(struct s break; case SSB_BUSTYPE_PCMCIA: #ifdef CONFIG_SSB_PCMCIAHOST diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 1420dd115d00..4c7bd9355f2b 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -179,7 +179,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return ((u64)(mfilt[1]) << 32) | mfilt[0]; --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c -@@ -896,17 +896,35 @@ out: +@@ -897,17 +897,35 @@ out: return err; } @@ -435,7 +435,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 size_t fw_name_len, u32 *hw_ver); --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c -@@ -360,11 +360,18 @@ out: +@@ -362,11 +362,18 @@ out: return ret; } @@ -454,7 +454,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 int i; BUILD_BUG_ON(ARRAY_SIZE(priv->mc_maclist) != -@@ -374,12 +381,23 @@ static u64 p54_prepare_multicast(struct +@@ -376,12 +383,23 @@ static u64 p54_prepare_multicast(struct * Otherwise the firmware will drop it and ARP will no longer work. */ i = 1; @@ -536,7 +536,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -2611,11 +2611,20 @@ struct wl1271_filter_params { +@@ -2614,11 +2614,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -557,7 +557,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 struct wl1271 *wl = hw->priv; if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -2628,16 +2637,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2631,16 +2640,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ @@ -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 -@@ -140,7 +140,11 @@ static void _brcmf_set_multicast_list(st +@@ -142,7 +142,11 @@ static void _brcmf_set_multicast_list(st netdev_for_each_mc_addr(ha, ndev) { if (!cnt) break; @@ -651,7 +651,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2140,7 +2140,11 @@ struct ieee80211_ops { +@@ -2151,7 +2151,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 -@@ -801,7 +801,12 @@ struct ieee80211_local { +@@ -802,7 +802,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 */ -@@ -604,9 +608,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -605,9 +609,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/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index 9bb1b4302800..e7f2c8601717 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -187,7 +187,7 @@ suspend and resume that are not backported. --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c -@@ -56,7 +56,7 @@ static bool +@@ -59,7 +59,7 @@ static bool brcmf_pm_resume_error(struct brcmf_sdio_dev *sdiodev) { bool is_err = false; @@ -196,7 +196,7 @@ suspend and resume that are not backported. is_err = atomic_read(&sdiodev->suspend); #endif return is_err; -@@ -65,7 +65,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ +@@ -68,7 +68,7 @@ brcmf_pm_resume_error(struct brcmf_sdio_ static void brcmf_pm_resume_wait(struct brcmf_sdio_dev *sdiodev, wait_queue_head_t *wq) { @@ -205,7 +205,7 @@ suspend and resume that are not backported. int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -536,7 +536,7 @@ static void brcmf_ops_sdio_remove(struct +@@ -539,7 +539,7 @@ static void brcmf_ops_sdio_remove(struct } } @@ -214,7 +214,7 @@ suspend and resume that are not backported. static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -586,7 +586,7 @@ static struct sdio_driver brcmf_sdmmc_dr +@@ -589,7 +589,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, .name = "brcmfmac", .id_table = brcmf_sdmmc_ids, diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index 601f77f5d0a4..949f31959dc9 100644 --- a/patches/30-bridge-port.patch +++ b/patches/30-bridge-port.patch @@ -34,7 +34,7 @@ compat-wireless. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1598,7 +1598,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1597,7 +1597,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) { diff --git a/patches/36-workqueue.patch b/patches/36-workqueue.patch index 2258df7f1097..62c4181c52e3 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 -@@ -1103,6 +1103,10 @@ static void __exit ieee80211_exit(void) +@@ -1104,6 +1104,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 793130c3eb93..57254352b479 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 -@@ -184,7 +184,9 @@ void iwl_leds_init(struct iwl_priv *priv +@@ -188,7 +188,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 8e34b8c69c7c..3a79e7413d1e 100644 --- a/patches/39-remove_blink_set.patch +++ b/patches/39-remove_blink_set.patch @@ -44,7 +44,7 @@ void iwl_leds_init(struct iwl_priv *priv) { -@@ -183,7 +185,9 @@ void iwl_leds_init(struct iwl_priv *priv +@@ -187,7 +189,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 fbbaeeaa9911..520522fc55b2 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 -@@ -4178,7 +4178,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -4182,7 +4182,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/45-remove-platform-id-table.patch b/patches/45-remove-platform-id-table.patch index 0c1a70864559..70110b64e66c 100644 --- a/patches/45-remove-platform-id-table.patch +++ b/patches/45-remove-platform-id-table.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/wl12xx/main.c +++ b/drivers/net/wireless/wl12xx/main.c -@@ -5318,16 +5318,20 @@ static int __devexit wl12xx_remove(struc +@@ -5319,16 +5319,20 @@ static int __devexit wl12xx_remove(struc return 0; } diff --git a/patches/48-use_skb_get_queue_mapping.patch b/patches/48-use_skb_get_queue_mapping.patch index 6f172bd952a0..e37356410157 100644 --- a/patches/48-use_skb_get_queue_mapping.patch +++ b/patches/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 -@@ -3430,11 +3430,11 @@ static void b43_op_tx(struct ieee80211_h +@@ -3405,11 +3405,11 @@ static void b43_op_tx(struct ieee80211_h } B43_WARN_ON(skb_shinfo(skb)->nr_frags); -- 2.30.2