From 5a031852ce113ecc93286c856f78ee950b155ef5 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 2 Sep 2010 08:08:35 -0700 Subject: [PATCH] compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 2 +- patches/04-netns.patch | 10 +++++----- patches/10-add-wext-handlers-to-netdev.patch | 2 +- patches/14-device-type.patch | 2 +- patches/25-multicast-list_head.patch | 8 ++++---- patches/28-pm-qos-params.patch | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index 2c3cd7e3bef1..b81715bf7c32 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -170,7 +170,7 @@ without creating a headache on maintenance of the pathes. } EXPORT_SYMBOL(wireless_send_event); -@@ -903,8 +932,13 @@ static int wireless_process_ioctl(struct +@@ -919,8 +948,13 @@ static int wireless_process_ioctl(struct return private(dev, iwr, cmd, info, handler); } /* Old driver API : call driver ioctl handler */ diff --git a/patches/04-netns.patch b/patches/04-netns.patch index b631961588b6..9f33f9efd3bd 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -54,7 +54,7 @@ files... rdev->rfkill_ops.set_block = cfg80211_rfkill_set_block; rdev->rfkill = rfkill_alloc(dev_name(&rdev->wiphy.dev), -@@ -691,8 +695,10 @@ static int cfg80211_netdev_notifier_call +@@ -694,8 +698,10 @@ static int cfg80211_netdev_notifier_call mutex_lock(&rdev->devlist_mtx); list_add_rcu(&wdev->list, &rdev->netdev_list); rdev->devlist_generation++; @@ -65,7 +65,7 @@ files... if (sysfs_create_link(&dev->dev.kobj, &rdev->wiphy.dev.kobj, "phy80211")) { -@@ -836,6 +842,7 @@ static struct notifier_block cfg80211_ne +@@ -839,6 +845,7 @@ static struct notifier_block cfg80211_ne .notifier_call = cfg80211_netdev_notifier_call, }; @@ -73,7 +73,7 @@ files... static void __net_exit cfg80211_pernet_exit(struct net *net) { struct cfg80211_registered_device *rdev; -@@ -853,14 +860,17 @@ static void __net_exit cfg80211_pernet_e +@@ -856,14 +863,17 @@ static void __net_exit cfg80211_pernet_e static struct pernet_operations cfg80211_pernet_ops = { .exit = cfg80211_pernet_exit, }; @@ -91,7 +91,7 @@ files... err = wiphy_sysfs_init(); if (err) -@@ -895,8 +905,10 @@ out_fail_nl80211: +@@ -898,8 +908,10 @@ out_fail_nl80211: out_fail_notifier: wiphy_sysfs_exit(); out_fail_sysfs: @@ -102,7 +102,7 @@ files... return err; } subsys_initcall(cfg80211_init); -@@ -908,7 +920,9 @@ static void __exit cfg80211_exit(void) +@@ -911,7 +923,9 @@ static void __exit cfg80211_exit(void) unregister_netdevice_notifier(&cfg80211_netdev_notifier); wiphy_sysfs_exit(); regulatory_exit(); diff --git a/patches/10-add-wext-handlers-to-netdev.patch b/patches/10-add-wext-handlers-to-netdev.patch index 6d2677b900f1..8a5c6e5338ad 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; -@@ -709,6 +705,8 @@ static int cfg80211_netdev_notifier_call +@@ -712,6 +708,8 @@ 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/14-device-type.patch b/patches/14-device-type.patch index 8718235f20b9..0f36773f0b75 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 -@@ -652,9 +652,11 @@ static void wdev_cleanup_work(struct wor +@@ -655,9 +655,11 @@ static void wdev_cleanup_work(struct wor dev_put(wdev->netdev); } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 44f27a68ebf5..2869364bd6d2 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -174,7 +174,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void ath5k_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, unsigned int *new_flags, -@@ -3165,20 +3169,42 @@ unlock: +@@ -3167,20 +3171,42 @@ unlock: } static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -217,7 +217,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -3187,6 +3213,9 @@ static u64 ath5k_prepare_multicast(struc +@@ -3189,6 +3215,9 @@ static u64 ath5k_prepare_multicast(struc * neet to inform below to not reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ @@ -637,7 +637,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -691,7 +691,12 @@ struct ieee80211_local { +@@ -698,7 +698,12 @@ struct ieee80211_local { struct work_struct recalc_smps; /* aggregated multicast list */ @@ -693,7 +693,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 spin_unlock_bh(&local->filter_lock); /* be a bit nasty */ -@@ -515,9 +519,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( +@@ -521,9 +525,11 @@ struct ieee80211_hw *ieee80211_alloc_hw( local->uapsd_max_sp_len = IEEE80211_DEFAULT_MAX_SP_LEN; INIT_LIST_HEAD(&local->interfaces); diff --git a/patches/28-pm-qos-params.patch b/patches/28-pm-qos-params.patch index db87bc726618..5042e4745eae 100644 --- a/patches/28-pm-qos-params.patch +++ b/patches/28-pm-qos-params.patch @@ -90,7 +90,7 @@ little wierd. module_init(ipw2100_init); --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -590,7 +590,11 @@ void ieee80211_recalc_ps(struct ieee8021 +@@ -596,7 +596,11 @@ void ieee80211_recalc_ps(struct ieee8021 s32 beaconint_us; if (latency < 0) -- 2.30.2