rtlwifi: rtl8192de: fix ofdm power compensation
Ping-Ke Shih
maintainerPATCH 1/1 rtlwifi: rtl8192de: fix ofdm power compensation
ofdm_index[] is used to indicate how many power compensation is needed to current thermal value. For internal PA module or 2.4G band, the min_index is different from other cases.
This issue originally is reported by Dan. He found the size of ofdm_index[] is 2, but access index 'i' may be equal to 2 if 'rf' is 2 in case of 'is2t'.
In fact, the chunk of code is added to wrong place, so move it back to proper place, and then power compensation and buffer overflow are fixed.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.c +7 -6
@@ -986,18 +986,19 @@ static void rtl92d_dm_txpower_tracking_callback_thermalmeter( rtlpriv->dm.cck_index); }for (i =0 ; i < rf; i++) { -if (ofdm_index[i] >OFDM_TABLE_SIZE_92D -1 ) +if (ofdm_index[i] >OFDM_TABLE_SIZE_92D -1 ) { ofdm_index[i] =OFDM_TABLE_SIZE_92D -1 ; -else if (ofdm_index[i] < ofdm_min_index) + }else if (internal_pa || + rtlhal->current_bandtype ==BAND_ON_2_4G ) { +if (ofdm_index[i] < ofdm_min_index_internal_pa) + ofdm_index[i] = ofdm_min_index_internal_pa; + }else if (ofdm_index[i] < ofdm_min_index) { ofdm_index[i] = ofdm_min_index; + } }if (rtlhal->current_bandtype ==BAND_ON_2_4G ) {if (cck_index >CCK_TABLE_SIZE -1 ) { cck_index =CCK_TABLE_SIZE -1 ; - }else if (internal_pa || - rtlhal->current_bandtype ==BAND_ON_2_4G ) { -if (ofdm_index[i] < ofdm_min_index_internal_pa) - ofdm_index[i] = ofdm_min_index_internal_pa; }else if (cck_index <0 ) { cck_index =0 ; }
Signature · 1 line
2.21.0
Quoted 8 lines · Ping-Ke Shih
ofdm_index[] is used to indicate how many power compensation is needed to current thermal value. For internal PA module or 2.4G band, the
min_indexis different from other cases.This issue originally is reported by Dan. He found the size of ofdm_index[] is 2, but access index 'i' may be equal to 2 if 'rf' is 2 in case of 'is2t'.
Quoted 5 lines
In fact, the chunk of code is added to wrong place, so move it back to proper place, and then power compensation and buffer overflow are fixed.
Reported-by Dan Carpenter <[email protected]>Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
3f79e541593f rtlwifi: rtl8192de: fix ofdm power compensation
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches