aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2012-06-27 22:57:59 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-28 14:37:50 -0400
commit34202e28fe7fc8551313f9a035a8857db83de757 (patch)
tree74086b8a3c6c78b446b84273fc5d83bef226ffc2
parent2041d7dff287333036145ba3aab57e3b675babef (diff)
mwifiex: retrieve correct max_power information in reg_notifier handler
As we don't provide custom regulatory rules to cfg80211, "chan->max_power" remains uninitialized (0dbm) and "chan->max_reg_power" will contain maximum power for a channel extracted from regulatory rules provided by CRDA; hence use "chan->max_reg_power" in reg_notifier handler instead of "chan->max_power" to set max_power in firmware. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index cf97c2aec8b4..bb06d2e3274a 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -260,13 +260,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
260 flag = 1; 260 flag = 1;
261 first_chan = (u32) ch->hw_value; 261 first_chan = (u32) ch->hw_value;
262 next_chan = first_chan; 262 next_chan = first_chan;
263 max_pwr = ch->max_power; 263 max_pwr = ch->max_reg_power;
264 no_of_parsed_chan = 1; 264 no_of_parsed_chan = 1;
265 continue; 265 continue;
266 } 266 }
267 267
268 if (ch->hw_value == next_chan + 1 && 268 if (ch->hw_value == next_chan + 1 &&
269 ch->max_power == max_pwr) { 269 ch->max_reg_power == max_pwr) {
270 next_chan++; 270 next_chan++;
271 no_of_parsed_chan++; 271 no_of_parsed_chan++;
272 } else { 272 } else {
@@ -277,7 +277,7 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
277 no_of_triplet++; 277 no_of_triplet++;
278 first_chan = (u32) ch->hw_value; 278 first_chan = (u32) ch->hw_value;
279 next_chan = first_chan; 279 next_chan = first_chan;
280 max_pwr = ch->max_power; 280 max_pwr = ch->max_reg_power;
281 no_of_parsed_chan = 1; 281 no_of_parsed_chan = 1;
282 } 282 }
283 } 283 }