mwifiex: retrieve correct max_power information in reg_notifier handler
authorAmitkumar Karwar <akarwar@marvell.com>
Thu, 28 Jun 2012 02:57:59 +0000 (19:57 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 28 Jun 2012 18:37:50 +0000 (14:37 -0400)
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>
drivers/net/wireless/mwifiex/cfg80211.c

index cf97c2aec8b41c39ca79d8f201d7089e4d3912a9..bb06d2e3274a5cdf20d6333a87899432232a24d3 100644 (file)
@@ -260,13 +260,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
                        flag = 1;
                        first_chan = (u32) ch->hw_value;
                        next_chan = first_chan;
-                       max_pwr = ch->max_power;
+                       max_pwr = ch->max_reg_power;
                        no_of_parsed_chan = 1;
                        continue;
                }
 
                if (ch->hw_value == next_chan + 1 &&
-                   ch->max_power == max_pwr) {
+                   ch->max_reg_power == max_pwr) {
                        next_chan++;
                        no_of_parsed_chan++;
                } else {
@@ -277,7 +277,7 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
                        no_of_triplet++;
                        first_chan = (u32) ch->hw_value;
                        next_chan = first_chan;
-                       max_pwr = ch->max_power;
+                       max_pwr = ch->max_reg_power;
                        no_of_parsed_chan = 1;
                }
        }