From d32228db523613f95239fb063c46559838e3d7bd Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 25 Aug 2011 13:33:43 -0700 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/04-netns.patch | 12 ++++++------ patches/09-threaded-irq.patch | 8 ++++---- patches/10-add-wext-handlers-to-netdev.patch | 2 +- patches/11-dev-pm-ops.patch | 4 ++-- patches/14-device-type.patch | 2 +- patches/15-symbol-export-conflicts.patch | 2 +- patches/25-multicast-list_head.patch | 16 ++++++++-------- patches/32-remove-ns-type.patch | 4 ++-- patches/42-netlink_seq.patch | 2 +- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 96392a9ed220..4cf35a2632a6 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 -@@ -4794,7 +4794,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4809,7 +4809,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), -@@ -802,8 +806,10 @@ static int cfg80211_netdev_notifier_call +@@ -809,8 +813,10 @@ static int cfg80211_netdev_notifier_call mutex_lock(&rdev->devlist_mtx); list_add_rcu(&wdev->list, &rdev->netdev_list); rdev->devlist_generation++; @@ -55,7 +55,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -983,6 +989,7 @@ static struct notifier_block cfg80211_ne +@@ -990,6 +996,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; -@@ -1000,14 +1007,17 @@ static void __net_exit cfg80211_pernet_e +@@ -1007,14 +1014,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) -@@ -1042,8 +1052,10 @@ out_fail_nl80211: +@@ -1049,8 +1059,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -92,7 +92,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -1055,7 +1067,9 @@ static void __exit cfg80211_exit(void) +@@ -1062,7 +1074,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index cc8c5d4d6357..de8497289229 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 -@@ -4144,8 +4144,13 @@ redo: +@@ -4168,8 +4168,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; -@@ -4185,9 +4190,17 @@ static int b43_wireless_core_start(struc +@@ -4209,9 +4214,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); -@@ -4957,6 +4970,10 @@ static int b43_setup_bands(struct b43_wl +@@ -5000,6 +5013,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 -@@ -798,6 +798,9 @@ struct b43_wldev { +@@ -803,6 +803,9 @@ struct b43_wldev { unsigned int tx_count; unsigned int rx_count; #endif diff --git a/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch index 64c7f7e4e115..1353ab3c77d9 100644 --- a/patches/10-add-wext-handlers-to-netdev.patch +++ b/patches/10-add-wext-handlers-to-netdev.patch @@ -29,7 +29,7 @@ CONFIG_WIRELESS_EXT in compat-wireless. device_initialize(&rdev->wiphy.dev); rdev->wiphy.dev.class = &ieee80211_class; rdev->wiphy.dev.platform_data = rdev; -@@ -819,6 +815,15 @@ static int cfg80211_netdev_notifier_call +@@ -826,6 +822,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/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index b486016aad6a..48d765f7c1b0 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -84,7 +84,7 @@ calls on compat code with only slight modifications. /* --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -347,14 +347,10 @@ static int ath_pci_resume(struct device +@@ -354,14 +354,10 @@ static int ath_pci_resume(struct device return 0; } @@ -103,7 +103,7 @@ calls on compat code with only slight modifications. #define ATH9K_PM_OPS (&ath9k_pm_ops) -@@ -372,7 +368,12 @@ static struct pci_driver ath_pci_driver +@@ -379,7 +375,12 @@ static struct pci_driver ath_pci_driver .id_table = ath_pci_id_table, .probe = ath_pci_probe, .remove = ath_pci_remove, diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index c32fb00e77e6..8416f077ab90 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -8,7 +8,7 @@ compile warning. --- a/net/wireless/core.c +++ b/net/wireless/core.c -@@ -762,9 +762,11 @@ static void wdev_cleanup_work(struct wor +@@ -769,9 +769,11 @@ static void wdev_cleanup_work(struct wor dev_put(wdev->netdev); } diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index a12a204c3d00..0f5b588d4612 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 -@@ -2957,7 +2957,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -2974,7 +2974,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 44ce762b7e2d..1a22119d5df4 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 -@@ -847,17 +847,35 @@ out: +@@ -896,17 +896,35 @@ out: return err; } @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -4726,7 +4746,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -4723,7 +4743,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; -@@ -4737,7 +4761,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -4734,7 +4758,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; } -@@ -4859,7 +4887,11 @@ static void mwl8k_configure_filter(struc +@@ -4856,7 +4884,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); @@ -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 -@@ -308,11 +308,18 @@ out: +@@ -359,11 +359,18 @@ out: return ret; } @@ -454,7 +454,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 int i; BUILD_BUG_ON(ARRAY_SIZE(priv->mc_maclist) != -@@ -322,12 +329,23 @@ static u64 p54_prepare_multicast(struct +@@ -373,12 +380,23 @@ static u64 p54_prepare_multicast(struct * Otherwise the firmware will drop it and ARP will no longer work. */ i = 1; @@ -637,7 +637,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return hash.low | ((u64)hash.high << 32); --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c -@@ -313,7 +313,11 @@ static void _brcmf_set_multicast_list(st +@@ -225,7 +225,11 @@ static void _brcmf_set_multicast_list(st netdev_for_each_mc_addr(ha, dev) { if (!cnt) break; @@ -712,7 +712,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -772,7 +772,12 @@ struct ieee80211_local { +@@ -773,7 +773,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ diff --git a/patches/32-remove-ns-type.patch b/patches/32-remove-ns-type.patch index 7914aa938524..88045671dc8d 100644 --- a/patches/32-remove-ns-type.patch +++ b/patches/32-remove-ns-type.patch @@ -1,6 +1,6 @@ --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c -@@ -119,12 +119,14 @@ static int wiphy_resume(struct device *d +@@ -121,12 +121,14 @@ static int wiphy_resume(struct device *d return ret; } @@ -15,7 +15,7 @@ struct class ieee80211_class = { .name = "ieee80211", -@@ -136,8 +138,10 @@ struct class ieee80211_class = { +@@ -138,8 +140,10 @@ struct class ieee80211_class = { #endif .suspend = wiphy_suspend, .resume = wiphy_resume, diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch index a62043f80389..9eb999b1027d 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 -@@ -3874,7 +3874,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -3889,7 +3889,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); -- 2.30.2