Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34202e28 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

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: 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 2041d7df

drivers/net/wireless/mwifiex/cfg80211.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}