diff options
| author | Hong Wu <Hong.Wu@dspg.com> | 2012-01-11 20:34:30 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-24 14:21:11 -0500 |
| commit | a48b13ac811ee236151d9e0e0dcb5639b2ab4591 (patch) | |
| tree | 0a9a83a9baa14a14932d44e4a3ba3554f951e1b5 /net/mac80211/mlme.c | |
| parent | eccc068e8e84c8fe997115629925e0422a98e4de (diff) | |
| download | lwn-a48b13ac811ee236151d9e0e0dcb5639b2ab4591.tar.gz lwn-a48b13ac811ee236151d9e0e0dcb5639b2ab4591.zip | |
mac80211: Fix the maximum transmit power with power constraint
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>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index ecb4c84c1bb3..95d3964fc080 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -547,7 +547,7 @@ static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata, if (pwr_constr_elem_len != 1) 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)) { sdata->local->power_constr_level = *pwr_constr_elem; ieee80211_hw_config(sdata->local, 0); |