From 670e60e00a0e8c4eb0a8c7b90e6c32d8a238433e Mon Sep 17 00:00:00 2001 From: Hong Wu Date: Wed, 11 Jan 2012 20:34:30 +0200 Subject: [PATCH] --- yaml --- r: 289954 b: refs/heads/master c: a48b13ac811ee236151d9e0e0dcb5639b2ab4591 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 3 ++- trunk/net/mac80211/mlme.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8398f21c4643..09047274742c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eccc068e8e84c8fe997115629925e0422a98e4de +refs/heads/master: a48b13ac811ee236151d9e0e0dcb5639b2ab4591 diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index 0a0d94ad9b08..6192caadfab9 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/net/mac80211/main.c @@ -155,7 +155,8 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) power = chan->max_power; else 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; if (local->user_power_level >= 0) diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index ecb4c84c1bb3..95d3964fc080 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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);