leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac80211: Fix the maximum transmit power with power constraint

Browse Source 
The local maximum transmit power for a channel is defined as the maximum
regulatory transmission power minus the local power constraint specified
for the channel in the Power Constraint element. (7.3.2.15 IEEE80211 2007)

Signed-off-by: Hong Wu <hong.wu@dspg.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Hong Wu 2012-01-11 20:34:30 +02:00 committed by John W. Linville
parent eccc068e8e
commit a48b13ac81
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/main.c
View File

@ -155,7 +155,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
power = chan->max_power; power = chan->max_power;
else else
power = local->power_constr_level ? power = local->power_constr_level ?
(chan->max_power - local->power_constr_level) : min(chan->max_power,
(chan->max_reg_power - local->power_constr_level)) :
chan->max_power; chan->max_power;
if (local->user_power_level >= 0) if (local->user_power_level >= 0)

2
net/mac80211/mlme.c
View File

@ -547,7 +547,7 @@ static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata,
if (pwr_constr_elem_len != 1) if (pwr_constr_elem_len != 1)
return; return;
if ((*pwr_constr_elem <= conf->channel->max_power) && if ((*pwr_constr_elem <= conf->channel->max_reg_power) &&
(*pwr_constr_elem != sdata->local->power_constr_level)) { (*pwr_constr_elem != sdata->local->power_constr_level)) {
sdata->local->power_constr_level = *pwr_constr_elem; sdata->local->power_constr_level = *pwr_constr_elem;
ieee80211_hw_config(sdata->local, 0); ieee80211_hw_config(sdata->local, 0);