This is a note to let you know that I've just added the patch titled
cfg80211: pass the reg hint initiator to helpers
to the 2.6.37-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cfg80211-pass-the-reg-hint-initiator-to-helpers.patch
and it can be found in the queue-2.6.37 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 7ca43d03b1291481bdf894bbaec5d580e7684e7d Mon Sep 17 00:00:00 2001
From: Luis R. Rodriguez <[email protected]>
Date: Wed, 20 Oct 2010 10:18:53 -0700
Subject: cfg80211: pass the reg hint initiator to helpers
From: Luis R. Rodriguez <[email protected]>
commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d upstream.
This is required later.
Cc: Easwar Krishnan <[email protected]>
Signed-off-by: Luis R. Rodriguez <[email protected]>
Signed-off-by: John W. Linville <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/wireless/reg.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -720,7 +720,9 @@ EXPORT_SYMBOL(freq_reg_info);
* on the wiphy with the target_bw specified. Then we can simply use
* that below for the desired_bw_khz below.
*/
-static void handle_channel(struct wiphy *wiphy, enum ieee80211_band band,
+static void handle_channel(struct wiphy *wiphy,
+ enum nl80211_reg_initiator initiator,
+ enum ieee80211_band band,
unsigned int chan_idx)
{
int r;
@@ -784,7 +786,9 @@ static void handle_channel(struct wiphy
chan->max_power = (int) MBM_TO_DBM(power_rule->max_eirp);
}
-static void handle_band(struct wiphy *wiphy, enum ieee80211_band band)
+static void handle_band(struct wiphy *wiphy,
+ enum ieee80211_band band,
+ enum nl80211_reg_initiator initiator)
{
unsigned int i;
struct ieee80211_supported_band *sband;
@@ -793,7 +797,7 @@ static void handle_band(struct wiphy *wi
sband = wiphy->bands[band];
for (i = 0; i < sband->n_channels; i++)
- handle_channel(wiphy, band, i);
+ handle_channel(wiphy, initiator, band, i);
}
static bool ignore_reg_update(struct wiphy *wiphy,
@@ -1030,7 +1034,7 @@ void wiphy_update_regulatory(struct wiph
goto out;
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (wiphy->bands[band])
- handle_band(wiphy, band);
+ handle_band(wiphy, band, initiator);
}
out:
reg_process_beacons(wiphy);
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.37/ath9k-fix-assumptions-for-idle-calls-on-suspend-resume.patch
queue-2.6.37/ath9k_hw-disabled-paprd-for-ar9003.patch
queue-2.6.37/cfg80211-fix-disabling-channels-based-on-hints.patch
queue-2.6.37/cfg80211-fix-allowing-country-ies-for-wiphy_flag_strict_regulatory.patch
queue-2.6.37/ath9k-fix-aphy-wiphy-idle-mismatch.patch
queue-2.6.37/cfg80211-pass-the-reg-hint-initiator-to-helpers.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
