Commit e9a14094 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: make Index24G_CCK_Base a 1-D array 



Make Index24G_CCK_Base a one-dimensional array. This driver uses only
Index24G_CCK_Base[0].

Acked-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220105083426.177128-3-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1dfe7fb

drivers/staging/r8188eu/hal/rtl8188e_hal_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1121,14 +1121,14 @@ void Hal_ReadTxPowerInfo88E(struct adapter *padapter, u8 *PROMContent, bool Auto 
	for (ch = 0; ch < CHANNEL_MAX_NUMBER; ch++) {

		hal_get_chnl_group_88e(ch, &group);



		pHalData->Index24G_CCK_Base[0][ch] = pwrInfo24G.IndexCCK_Base[0][group];

		pHalData->Index24G_CCK_Base[ch] = pwrInfo24G.IndexCCK_Base[0][group];

		if (ch == 14)

			pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][4];

		else

			pHalData->Index24G_BW40_Base[0][ch] = pwrInfo24G.IndexBW40_Base[0][group];



		DBG_88E("======= Path 0, Channel %d =======\n", ch);

		DBG_88E("Index24G_CCK_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[0][ch]);

		DBG_88E("Index24G_CCK_Base[%d] = 0x%x\n", ch, pHalData->Index24G_CCK_Base[ch]);

		DBG_88E("Index24G_BW40_Base[0][%d] = 0x%x\n", ch, pHalData->Index24G_BW40_Base[0][ch]);

	}

	for (TxCount = 0; TxCount < MAX_TX_COUNT; TxCount++) {

drivers/staging/r8188eu/hal/rtl8188e_phycfg.c

+1 −1
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower 
	u8 index = (channel - 1);



	/*  1. CCK */

	cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[RF_PATH_A][index];

	cckPowerLevel[RF_PATH_A] = pHalData->Index24G_CCK_Base[index];

	/* 2. OFDM */

	ofdmPowerLevel[RF_PATH_A] = pHalData->Index24G_BW40_Base[RF_PATH_A][index] +

		pHalData->OFDM_24G_Diff[RF_PATH_A][RF_PATH_A];

drivers/staging/r8188eu/include/rtl8188e_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ struct hal_data_8188e { 
	u8	EEPROMRegulatory;

	u8	EEPROMThermalMeter;



	u8	Index24G_CCK_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];

	u8	Index24G_CCK_Base[CHANNEL_MAX_NUMBER];

	u8	Index24G_BW40_Base[RF_PATH_MAX][CHANNEL_MAX_NUMBER];

	/* If only one tx, only BW20 and OFDM are used. */

	s8	CCK_24G_Diff[RF_PATH_MAX][MAX_TX_COUNT];