Revert "mwifiex: retrieve correct max_power information in reg_notifier handler"
This reverts commit34202e28fe
We made "34202ee.." because we didn't support custom regulatory rules at that time. But now we use our own custom regulatory rules, so it needs to be changed back. Also, chan->max_power calculations in cfg80211 were broken. Hence we started using chan->max_reg_power. Now it has got fixed in following commit. commit5e31fc0815
Author: Stanislaw Gruszka <sgruszka@redhat.com> Date: Tue Jul 24 08:35:39 2012 +0200 wireless: reg: restore previous behaviour of chan->max_power calculations Hence we will use chan->max_power instead of chan->max_reg_power. 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>
This commit is contained in:
parent
f3e1af3e18
commit
22db24976f
|
@ -471,13 +471,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_reg_power;
|
||||
max_pwr = ch->max_power;
|
||||
no_of_parsed_chan = 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ch->hw_value == next_chan + 1 &&
|
||||
ch->max_reg_power == max_pwr) {
|
||||
ch->max_power == max_pwr) {
|
||||
next_chan++;
|
||||
no_of_parsed_chan++;
|
||||
} else {
|
||||
|
@ -488,7 +488,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_reg_power;
|
||||
max_pwr = ch->max_power;
|
||||
no_of_parsed_chan = 1;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue