From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: <linville@tuxdriver.com>, <johannes@sipsolutions.net>
Cc: <easwar.krishnan@atheros.com>, <linux-wireless@vger.kernel.org>,
"Luis R. Rodriguez" <lrodriguez@atheros.com>, <stable@kernel.org>
Subject: [PATCH 1/7] cfg80211: pass the reg hint initiator to helpers
Date: Wed, 20 Oct 2010 10:18:53 -0700 [thread overview]
Message-ID: <1287595139-10761-2-git-send-email-lrodriguez@atheros.com> (raw)
In-Reply-To: <1287595139-10761-1-git-send-email-lrodriguez@atheros.com>
This is required later.
Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
net/wireless/reg.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 4b9f891..b64596f 100644
--- 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 *wiphy, enum ieee80211_band band,
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 *wiphy, enum ieee80211_band band)
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 wiphy *wiphy,
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);
--
1.7.0.4
next prev parent reply other threads:[~2010-10-20 17:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-20 17:18 [PATCH 0/7] cfg80211: few regulatory fixes and debugging enhancements Luis R. Rodriguez
2010-10-20 17:18 ` Luis R. Rodriguez [this message]
2010-10-20 17:18 ` [PATCH 2/7] cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY Luis R. Rodriguez
2010-10-20 21:24 ` Gábor Stefanik
2010-10-20 17:18 ` [PATCH 3/7] cfg80211: fix disabling channels based on hints Luis R. Rodriguez
2010-10-20 17:18 ` [PATCH 4/7] cfg80211: add debug prints for when we ignore regulatory hints Luis R. Rodriguez
2010-10-20 17:18 ` [PATCH 5/7] cfg80211: add debug print when disabling a channel on a custom regd Luis R. Rodriguez
2010-10-20 17:18 ` [PATCH 6/7] cfg80211: add debug print when processing a channel Luis R. Rodriguez
2010-10-21 8:18 ` Senthil Balasubramanian
2010-10-21 9:02 ` Luis R. Rodriguez
2010-10-21 9:04 ` Luis R. Rodriguez
2010-10-20 17:18 ` [PATCH 7/7] cfg80211: prefix REG_DBG_PRINT() with cfg80211 Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287595139-10761-2-git-send-email-lrodriguez@atheros.com \
--to=lrodriguez@atheros.com \
--cc=easwar.krishnan@atheros.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).