hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cfg80211: pass the reg hint initiator to helpers 

This is required later.

Cc: Easwar Krishnan <easwar.krishnan@atheros.com>
Cc: stable@kernel.org
signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>

Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez 2010-10-20 10:18:53 -07:00 committed by John W. Linville
parent 2e48928d8a
commit 7ca43d03b1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/wireless/reg.c
View File

@ -720,7 +720,9 @@ EXPORT_SYMBOL(freq_reg_info);
* on the wiphy with the target_bw specified. Then we can simply use * on the wiphy with the target_bw specified. Then we can simply use
* that below for the desired_bw_khz below. * 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) unsigned int chan_idx)
{ {
int r; 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); 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; unsigned int i;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
@ -793,7 +797,7 @@ static void handle_band(struct wiphy *wiphy, enum ieee80211_band band)
sband = wiphy->bands[band]; sband = wiphy->bands[band];
for (i = 0; i < sband->n_channels; i++) 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, static bool ignore_reg_update(struct wiphy *wiphy,
@ -1030,7 +1034,7 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
goto out; goto out;
for (band = 0; band < IEEE80211_NUM_BANDS; band++) { for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (wiphy->bands[band]) if (wiphy->bands[band])
handle_band(wiphy, band); handle_band(wiphy, band, initiator);
} }
out: out:
reg_process_beacons(wiphy); reg_process_beacons(wiphy);