staging: r8188eu: remove rf_type and rtw_rf_config
v2 cover staging: r8188eu: remove rf_type and rtw_rf_config
This series removes rf_type from struct hal_data_8188e and the module paramater rtw_rc_config.
Tested on x86_64 with InterTech DMG-02.
v2:
included the previously sent series
"staging: r8188eu: remove more usages of rf_type"
Michael Straube (10):
staging: r8188eu: remove rf_type from rtw_update_ht_cap()
staging: r8188eu: remove rf_type from issue_assocreq()
staging: r8188eu: remove rf_type from storePwrIndexDiffRateOffset()
staging: r8188eu: remove rf_type from getTxPowerIndex88E()
staging: r8188eu: remove TxCount from getTxPowerIndex88E()
staging: r8188eu: remove rf_type from writeOFDMPowerReg88E()
staging: r8188eu: remove rf_type from bb_reg_dump()
staging: r8188eu: remove unused HW_VAR_RF_TYPE
staging: r8188eu: remove rf_type from struct hal_data_8188e
staging: r8188eu: remove module parameter rtw_rf_config
drivers/staging/r8188eu/core/rtw_mlme.c | 12 +-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 25 ++---- .../staging/r8188eu/hal/rtl8188e_hal_init.c | 4 - drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 85 +++---------------- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 6 +- drivers/staging/r8188eu/hal/usb_halinit.c | 3 - drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/hal_intf.h | 1 - .../staging/r8188eu/include/rtl8188e_hal.h | 3 - drivers/staging/r8188eu/include/rtw_rf.h | 10 --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 27 ++---- drivers/staging/r8188eu/os_dep/os_intfs.c | 3 - 12 files changed, 30 insertions(+), 150 deletions(-)
Signature · 1 line
2.34.0
PATCH v2 1/10 staging: r8188eu: remove rf_type from rtw_update_ht_cap()
rf_type is always RF_1T1R. Remove it from rtw_update_ht_cap() and remove related dead code.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +3 -9
@@ -1999,17 +1999,11 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len) (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & BIT(1)) && (pmlmeinfo->HT_info.infos[0] & BIT(2))) {int i; -u8 rf_type; - -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));/* update the MCS rates */ -for (i =0 ; i <16 ; i++) { -if ((rf_type ==RF_1T1R ) || (rf_type ==RF_1T2R )) - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; -else - pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_2R[i]; - } +for (i =0 ; i <16 ; i++) + pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; +/* switch to the 40M Hz mode according to the AP */ pmlmeext->cur_bwmode =HT_CHANNEL_WIDTH_40 ;switch ((pmlmeinfo->HT_info.infos[0 ] &0x3 )) {
Signature · 1 line
2.34.0
PATCH v2 2/10 staging: r8188eu: remove rf_type from issue_assocreq()
In reply to Michael Strauberf_type is always RF_1T1R. Remove it from issue_assocreq() and remove related dead code.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 25 +++++---------------- 1 file changed, 5 insertions(+), 20 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +5 -20
@@ -5060,7 +5060,7 @@ void issue_assocreq(struct adapter *padapter)__le16 *fctrl;__le16 le_tmp;unsigned int i, j, ie_len, index =0 ; -unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates]; +unsigned char bssrate[NumRates], sta_bssrate[NumRates];struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
@@ -5185,25 +5185,10 @@ void issue_assocreq(struct adapter *padapter)/* todo: disable SM power save mode */ pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x000c ); -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type)); -switch (rf_type) { -case RF_1T1R : -if (pregpriv->rx_stbc) - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ -memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R,16 ); -break ; -case RF_2T2R : -case RF_1T2R : -default : -if ((pregpriv->rx_stbc ==0x3 ) ||/* enable for 2.4/5 GHz */ - ((pmlmeext->cur_wireless_mode &WIRELESS_11_24N ) && (pregpriv->rx_stbc ==0x1 )) ||/* enable for 2.4GHz */ - (pregpriv->wifi_spec ==1 )) { -DBG_88E ("declare supporting RX STBC\n" ); - pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x0200 );/* RX STBC two spatial stream */ - } -memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R,16 ); -break ; - } +if (pregpriv->rx_stbc) + pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info |=cpu_to_le16 (0x0100 );/* RX STBC One spatial stream */ +memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_1R,16 ); + pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&pmlmeinfo->HT_caps), &pattrib->pktlen); } }
Signature · 1 line
2.34.0
PATCH v2 3/10 staging: r8188eu: remove rf_type from storePwrIndexDiffRateOffset()
In reply to Michael StraubepHalData->rf_type is always RF_1T1R. Remove unnecessary checks and related dead code from storePwrIndexDiffRateOffset().
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +2 -6
@@ -506,8 +506,7 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][4 ] = Data;if (RegAddr == rTxAGC_A_Mcs15_Mcs12) { pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][5 ] = Data; -if (pHalData->rf_type ==RF_1T1R ) - pHalData->pwrGroupCnt++; + pHalData->pwrGroupCnt++; }if (RegAddr == rTxAGC_B_Rate18_06) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][8 ] = Data;
@@ -523,11 +522,8 @@ void storePwrIndexDiffRateOffset(struct adapter *Adapter, u32 RegAddr, u32 BitMa pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][11 ] = Data;if (RegAddr == rTxAGC_B_Mcs11_Mcs08) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][12 ] = Data; -if (RegAddr == rTxAGC_B_Mcs15_Mcs12) { +if (RegAddr == rTxAGC_B_Mcs15_Mcs12) pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][13 ] = Data; -if (pHalData->rf_type !=RF_1T1R ) - pHalData->pwrGroupCnt++; - } }static int phy_BB8188E_Config_ParaFile (struct adapter *Adapter)
Signature · 1 line
2.34.0
PATCH v2 4/10 staging: r8188eu: remove rf_type from getTxPowerIndex88E()
In reply to Michael StraubepHalData->rf_type is always RF_1T1R. As a result the variable path_nums is always set to 1 and the for loop is entered only once with TxCount = 0. Also RF_PATH_A = 0. Remove the unneeded check for pHalData->rf_type and resulting dead code from getTxPowerIndex88E().
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 80 +++---------------- 1 file changed, 12 insertions(+), 68 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +12 -68
@@ -611,74 +611,18 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower {struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);u8 index = (channel -1 ); -u8 TxCount =0 , path_nums; - -if ((RF_1T2R == pHalData->rf_type) || (RF_1T1R == pHalData->rf_type)) - path_nums =1 ; -else - path_nums =2 ; - -for (TxCount =0 ; TxCount < path_nums; TxCount++) { -if (TxCount ==RF_PATH_A ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->OFDM_24G_Diff[TxCount][RF_PATH_A ]; -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ]; -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - }else if (TxCount ==RF_PATH_B ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - }else if (TxCount ==RF_PATH_C ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - }else if (TxCount ==RF_PATH_D ) { -/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; -/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[RF_PATH_C ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; - -/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[RF_PATH_B ][index] + - pHalData->BW20_24G_Diff[RF_PATH_C ][index] + - pHalData->BW20_24G_Diff[TxCount][index]; - -/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; - } - } +u8 TxCount =RF_PATH_A ; + +/* 1. CCK */ + cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; +/* 2. OFDM */ + ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->OFDM_24G_Diff[TxCount][RF_PATH_A ]; +/* 1. BW20 */ + BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ]; +/* 2. BW40 */ + BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; } static void phy_PowerIndexCheck88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,
Signature · 1 line
2.34.0
PATCH v2 5/10 staging: r8188eu: remove TxCount from getTxPowerIndex88E()
In reply to Michael StraubeIn getTxPowerIndex88E() the variable TxCount is set to RF_PATH_A and never changed. Remove the unnecessary extra variable and replace its usage with RF_PATH_A.
--- drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_phycfg.c +6 -7
@@ -611,18 +611,17 @@ static void getTxPowerIndex88E(struct adapter *Adapter, u8 channel, u8 *cckPower {struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);u8 index = (channel -1 ); -u8 TxCount =RF_PATH_A ;/* 1. CCK */ - cckPowerLevel[TxCount] = pHalData->Index24G_CCK_Base[TxCount][index]; + cckPowerLevel[RF_PATH_A ] = pHalData->Index24G_CCK_Base[RF_PATH_A ][index];/* 2. OFDM */ - ofdmPowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->OFDM_24G_Diff[TxCount][RF_PATH_A ]; + ofdmPowerLevel[RF_PATH_A ] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->OFDM_24G_Diff[RF_PATH_A ][RF_PATH_A ];/* 1. BW20 */ - BW20PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + - pHalData->BW20_24G_Diff[TxCount][RF_PATH_A ]; + BW20PowerLevel[RF_PATH_A ] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index] + + pHalData->BW20_24G_Diff[RF_PATH_A ][RF_PATH_A ];/* 2. BW40 */ - BW40PowerLevel[TxCount] = pHalData->Index24G_BW40_Base[TxCount][index]; + BW40PowerLevel[RF_PATH_A ] = pHalData->Index24G_BW40_Base[RF_PATH_A ][index]; } static void phy_PowerIndexCheck88E(struct adapter *Adapter, u8 channel, u8 *cckPowerLevel,
Signature · 1 line
2.34.0
PATCH v2 6/10 staging: r8188eu: remove rf_type from writeOFDMPowerReg88E()
In reply to Michael StraubepHalData->rf_type is always RF_1T1R. Remove unnecessary checks from writeOFDMPowerReg88E().
--- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +1 -5
@@ -272,7 +272,6 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel, }static void writeOFDMPowerReg88E (struct adapter *Adapter,u8 index,u32 *pValue) { -struct hal_data_8188e *pHalData =GET_HAL_DATA (Adapter);u16 regoffset_a[6 ] = { rTxAGC_A_Rate18_06, rTxAGC_A_Rate54_24, rTxAGC_A_Mcs03_Mcs00, rTxAGC_A_Mcs07_Mcs04,
@@ -302,10 +301,7 @@ static void writeOFDMPowerReg88E(struct adapter *Adapter, u8 index, u32 *pValue)PHY_SetBBReg (Adapter, regoffset, bMaskDWord, writeVal);/* 201005115 Joseph: Set Tx Power diff for Tx power training mechanism. */ -if (((pHalData->rf_type ==RF_2T2R ) && - (regoffset == rTxAGC_A_Mcs15_Mcs12 || regoffset == rTxAGC_B_Mcs15_Mcs12)) || - ((pHalData->rf_type !=RF_2T2R ) && - (regoffset == rTxAGC_A_Mcs07_Mcs04 || regoffset == rTxAGC_B_Mcs07_Mcs04))) { +if (regoffset == rTxAGC_A_Mcs07_Mcs04 || regoffset == rTxAGC_B_Mcs07_Mcs04) { writeVal = pwr_val[3 ];if (regoffset == rTxAGC_A_Mcs15_Mcs12 || regoffset == rTxAGC_A_Mcs07_Mcs04) regoffset =0xc90 ;
Signature · 1 line
2.34.0
PATCH v2 7/10 staging: r8188eu: remove rf_type from bb_reg_dump()
In reply to Michael Strauberf_type is always RF_1T1R. Remove it from bb_reg_dump() and remove resulting dead code.
--- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +9 -18
@@ -3611,27 +3611,18 @@ static void bb_reg_dump(struct adapter *padapter)static void rf_reg_dump (struct adapter *padapter) { -int i, j =1 , path; +int i, j =1 , path =0 ;u32 value; -u8 rf_type, path_nums =0 ; -GetHwReg8188EU (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));pr_info ("\n ======= RF REG =======\n" ); -if ((RF_1T2R == rf_type) || (RF_1T1R == rf_type)) - path_nums =1 ; -else - path_nums =2 ; - -for (path =0 ; path < path_nums; path++) { -pr_info ("\nRF_Path(%x)\n" , path); -for (i =0 ; i <0x100 ; i++) { - value =rtl8188e_PHY_QueryRFReg (padapter, path, i,0xffffffff ); -if (j %4 ==1 ) -pr_info ("0x%02x " , i); -pr_info (" 0x%08x " , value); -if ((j++) %4 ==0 ) -pr_info ("\n" ); - } +pr_info ("\nRF_Path(%x)\n" , path); +for (i =0 ; i <0x100 ; i++) { + value =rtl8188e_PHY_QueryRFReg (padapter, path, i,0xffffffff ); +if (j %4 ==1 ) +pr_info ("0x%02x " , i); +pr_info (" 0x%08x " , value); +if ((j++) %4 ==0 ) +pr_info ("\n" ); } }
Signature · 1 line
2.34.0
PATCH v2 8/10 staging: r8188eu: remove unused HW_VAR_RF_TYPE
In reply to Michael StraubeAfter previous cleanups HW_VAR_RF_TYPE is unused now. Remove it.
--- drivers/staging/r8188eu/hal/usb_halinit.c | 3 --- drivers/staging/r8188eu/include/hal_intf.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/r8188eu/hal/usb_halinit.c +0 -3
@@ -1685,9 +1685,6 @@ void GetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)case HW_VAR_DM_FLAG : val[0 ] = podmpriv->SupportAbility;break ; -case HW_VAR_RF_TYPE : - val[0 ] = haldata->rf_type; -break ;case HW_VAR_FWLPS_RF_ON : {/* When we halt NIC, we should check if FW LPS is leave. */
drivers/staging/r8188eu/include/hal_intf.h +0 -1
@@ -29,7 +29,6 @@ enum hw_variables {HW_VAR_ACK_PREAMBLE ,HW_VAR_SEC_CFG ,HW_VAR_BCN_VALID , -HW_VAR_RF_TYPE ,HW_VAR_DM_FLAG ,HW_VAR_DM_FUNC_OP , HW_VAR_DM_FUNC_SET,
Signature · 1 line
2.34.0
PATCH v2 9/10 staging: r8188eu: remove rf_type from struct hal_data_8188e
In reply to Michael StraubeThe field rf_type of struct hal_data_8188e is set to RF_1T1R and never changed. Also it is used only in a call to netdev_dbg() which is not very useful since RTL8188EU chips are always 1T1R. Remove the netdev_dbg() and remove rf_type from the hal_data_8188e structure.
--- drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 4 ---- drivers/staging/r8188eu/include/rtl8188e_hal.h | 3 --- 2 files changed, 7 deletions(-)
drivers/staging/r8188eu/hal/rtl8188e_hal_init.c +0 -4
@@ -854,10 +854,6 @@ void rtl8188e_read_chip_version(struct adapter *padapter)dump_chip_info (ChipVersion); pHalData->VersionID = ChipVersion; - - pHalData->rf_type =RF_1T1R ; - -netdev_dbg (padapter->pnetdev,"RF_Type is %x!!\n" , pHalData->rf_type); }void rtl8188e_SetHalODMVar (struct adapter *Adapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet)
drivers/staging/r8188eu/include/rtl8188e_hal.h +0 -3
@@ -168,9 +168,6 @@ struct hal_data_8188e {u16 BasicRateSet; -/* rf_ctrl */ -u8 rf_type; -/* EEPROM setting. */ u16 EEPROMSVID ;u16 EEPROMSDID ;
Signature · 1 line
2.34.0
PATCH v2 10/10 staging: r8188eu: remove module parameter rtw_rf_config
In reply to Michael StraubeThe module parameter rtw_rf_config is not used in the driver. Remove it and remove the now unused enum rt_rf_type_def.
--- drivers/staging/r8188eu/include/drv_types.h | 1 - drivers/staging/r8188eu/include/rtw_rf.h | 10 ---------- drivers/staging/r8188eu/os_dep/os_intfs.c | 3 --- 3 files changed, 14 deletions(-)
drivers/staging/r8188eu/include/drv_types.h +0 -1
@@ -85,7 +85,6 @@ struct registry_priv {u8 ampdu_amsdu;/* A-MPDU Supports A-MSDU is permitted */ u8 lowrate_two_xmit; -u8 rf_config;u8 low_power;u8 wifi_spec;/* !turbo_mode */
drivers/staging/r8188eu/include/rtw_rf.h +0 -10
@@ -99,16 +99,6 @@ enum ht_extchnl_offset { HT_EXTCHNL_OFFSET_LOWER = 3, }; -/* 2007/11/15 MH Define different RF type. */ -enum rt_rf_type_def { -RF_1T2R =0 , -RF_2T4R =1 , -RF_2T2R =2 , -RF_1T1R =3 , -RF_2T2R_GREEN =4 , -RF_819X_MAX_TYPE =5 , -}; -u32 rtw_ch2freq (u32 ch);#endif /* _RTL8711_RF_H_ */
drivers/staging/r8188eu/os_dep/os_intfs.c +0 -3
@@ -75,7 +75,6 @@ static int rtw_ampdu_amsdu;/* 0: disabled, 1:enabled, 2:auto */static int rtw_lowrate_two_xmit =1 ;/* Use 2 path Tx to transmit MCS0~7 and legacy mode */ -static int rtw_rf_config =RF_819X_MAX_TYPE ;/* auto */ static int rtw_low_power;static int rtw_wifi_spec;static int rtw_channel_plan =RT_CHANNEL_DOMAIN_MAX ;
@@ -123,7 +122,6 @@ module_param(rtw_ampdu_enable, int, 0644);module_param (rtw_rx_stbc, int,0644 );module_param (rtw_ampdu_amsdu, int,0644 );module_param (rtw_lowrate_two_xmit, int,0644 ); -module_param (rtw_rf_config, int,0644 );module_param (rtw_power_mgnt, int,0644 );module_param (rtw_smart_ps, int,0644 );module_param (rtw_low_power, int,0644 );
@@ -205,7 +203,6 @@ static uint loadparam(struct adapter *padapter, struct net_device *pnetdev) registry_par->rx_stbc = (u8 )rtw_rx_stbc; registry_par->ampdu_amsdu = (u8 )rtw_ampdu_amsdu; registry_par->lowrate_two_xmit = (u8 )rtw_lowrate_two_xmit; - registry_par->rf_config = (u8 )rtw_rf_config; registry_par->low_power = (u8 )rtw_low_power; registry_par->wifi_spec = (u8 )rtw_wifi_spec; registry_par->channel_plan = (u8 )rtw_channel_plan;
Signature · 1 line
2.34.0