Commit 22db2497 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville

Revert "mwifiex: retrieve correct max_power information in reg_notifier handler"

This reverts commit 34202e28

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.

commit 5e31fc08
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: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f3e1af3e
...@@ -471,13 +471,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy) ...@@ -471,13 +471,13 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
flag = 1; flag = 1;
first_chan = (u32) ch->hw_value; first_chan = (u32) ch->hw_value;
next_chan = first_chan; next_chan = first_chan;
max_pwr = ch->max_reg_power; max_pwr = ch->max_power;
no_of_parsed_chan = 1; no_of_parsed_chan = 1;
continue; continue;
} }
if (ch->hw_value == next_chan + 1 && if (ch->hw_value == next_chan + 1 &&
ch->max_reg_power == max_pwr) { ch->max_power == max_pwr) {
next_chan++; next_chan++;
no_of_parsed_chan++; no_of_parsed_chan++;
} else { } else {
...@@ -488,7 +488,7 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy) ...@@ -488,7 +488,7 @@ static int mwifiex_send_domain_info_cmd_fw(struct wiphy *wiphy)
no_of_triplet++; no_of_triplet++;
first_chan = (u32) ch->hw_value; first_chan = (u32) ch->hw_value;
next_chan = first_chan; next_chan = first_chan;
max_pwr = ch->max_reg_power; max_pwr = ch->max_power;
no_of_parsed_chan = 1; no_of_parsed_chan = 1;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment