staging: rtl8188eu: bugfix: correct channels range is set in Hal_ReadTxPowerInfo88E
PATCH 2/3 staging: rtl8188eu: bugfix: correct channels range is set in Hal_ReadTxPowerInfo88E
Correct channels range is 1..14 (numbering from 1) but not 0..13.
--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +6 -6
@@ -481,18 +481,18 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto pHalData->bTXPowerDataReadFromEEPORM = true;for (rfPath =0 ; rfPath < pHalData->NumTotalRFPath; rfPath++) { -for (ch =0 ; ch <CHANNEL_MAX_NUMBER ; ch++) { +for (ch =1 ; ch <=CHANNEL_MAX_NUMBER ; ch++) { group =get_channel_group (ch); - pHalData->Index24G_CCK_Base[rfPath][ch] = pwrInfo24G.IndexCCK_Base[rfPath][group]; + pHalData->Index24G_CCK_Base[rfPath][ch -1 ] = pwrInfo24G.IndexCCK_Base[rfPath][group];if (ch ==14 ) - pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][4 ]; + pHalData->Index24G_BW40_Base[rfPath][ch -1 ] = pwrInfo24G.IndexBW40_Base[rfPath][4 ];else - pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group]; + pHalData->Index24G_BW40_Base[rfPath][ch -1 ] = pwrInfo24G.IndexBW40_Base[rfPath][group];DBG_88E ("======= Path %d, Channel %d =======\n" , rfPath, ch); -DBG_88E ("Index24G_CCK_Base[%d][%d] = 0x%x\n" , rfPath, ch, pHalData->Index24G_CCK_Base[rfPath][ch]); -DBG_88E ("Index24G_BW40_Base[%d][%d] = 0x%x\n" , rfPath, ch, pHalData->Index24G_BW40_Base[rfPath][ch]); +DBG_88E ("Index24G_CCK_Base[%d][%d] = 0x%x\n" , rfPath, ch, pHalData->Index24G_CCK_Base[rfPath][ch -1 ]); +DBG_88E ("Index24G_BW40_Base[%d][%d] = 0x%x\n" , rfPath, ch, pHalData->Index24G_BW40_Base[rfPath][ch -1 ]); }for (TxCount =0 ; TxCount <MAX_TX_COUNT ; TxCount++) { pHalData->CCK_24G_Diff[rfPath][TxCount] = pwrInfo24G.CCK_Diff[rfPath][TxCount];
Signature · 1 line
2.4.9
Greg Kroah-Hartman
maintainerQuoted 1 line · Ivan Safonov
Correct channels range is 1..14 (numbering from 1) but not 0..13.
Why? Have you tested this?
Quoted 4 lines · Greg Kroah-Hartman
Quoted 1 line · Ivan Safonov
Correct channels range is 1..14 (numbering from 1) but not 0..13.
Have you tested this?
I have not tested it.
Quoted 3 lines
Why?
From condition
if (chnl <= 14) {
bIn24G = true;it shows that the highest number of channels at a frequency of 2.4 GHz is 14.
And first comment tells us that only 2 channels has the numbers <3, which means that the numbering starts from 1:
static u8 Hal_GetChnlGroup88E(u8 chnl, u8 *pGroup)
{
u8 bIn24G = true;
if (chnl <= 14) {
bIn24G = true;
if (chnl < 3) /* Channel 1-2 */
*pGroup = 0;
else if (chnl < 6) /* Channel 3-5 */
*pGroup = 1;
else if (chnl < 9) /* Channel 6-8 */
*pGroup = 2;
else if (chnl < 12) /* Channel 9-11 */
*pGroup = 3;
else if (chnl < 14) /* Channel 12-13 */
*pGroup = 4;
else if (chnl == 14) /* Channel 14 */
*pGroup = 5;
} else {... // 5 GHz groups
Hal_ReadTxPowerInfo88E function raises questions in this location(->):
if (bIn24G) {
pHalData->Index24G_CCK_Base[rfPath][ch] = pwrInfo24G.IndexCCK_Base[rfPath][group];
-> if (ch == 14)
-> pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][4];
-> else
-> pHalData->Index24G_BW40_Base[rfPath][ch] = pwrInfo24G.IndexBW40_Base[rfPath][group];
}If channel range is 0..(CHANNEL_MAX_NUMBER - 1) code is dead (CHANNEL_MAX_NUMBER = 14):
But if channel range is 1..14 will the right to remove branching if (ch == 14) in Hal_ReadTxPowerInfo88E, changing Hal_GetChnlGroup88E so that when chnl == 14 itreturned 4?