openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723bs: Move bandwidth index lookup to new function. 

Factoring out the conditional lookup of bandwidth index into the power
limit table into it's own function simplifies the logic of
'phy_get_tx_pwr_lmt()'.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Quytelda Kahja 2018-06-16 22:30:36 -07:00 committed by Greg Kroah-Hartman
parent 9ca65c3041
commit 81dff62b3d
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
View File

@ -1612,6 +1612,22 @@ static s8 phy_GetChannelIndexOfTxPowerLimit(u8 Band, u8 Channel)
return channelIndex;
}
static s16 get_bandwidth_idx(const enum CHANNEL_WIDTH bandwidth)
{
switch (bandwidth) {
case CHANNEL_WIDTH_20:
return 0;
case CHANNEL_WIDTH_40:
return 1;
case CHANNEL_WIDTH_80:
return 2;
case CHANNEL_WIDTH_160:
return 3;
default:
return -1;
}
}
static s16 get_rate_sctn_idx(const u8 rate)
{
switch (rate) {
@ -1703,15 +1719,7 @@ s8 phy_get_tx_pwr_lmt(struct adapter *adapter, u32 reg_pwr_tbl_sel,
else if (band_type == BAND_ON_5G)
idx_band = 1;
if (bandwidth == CHANNEL_WIDTH_20)
idx_bandwidth = 0;
else if (bandwidth == CHANNEL_WIDTH_40)
idx_bandwidth = 1;
else if (bandwidth == CHANNEL_WIDTH_80)
idx_bandwidth = 2;
else if (bandwidth == CHANNEL_WIDTH_160)
idx_bandwidth = 3;
idx_bandwidth = get_bandwidth_idx(bandwidth);
idx_rate_sctn = get_rate_sctn_idx(data_rate);
if (band_type == BAND_ON_5G && idx_rate_sctn == 0)