Commit d0421343 authored Jan 08, 2022 by Martin Kaiser Committed by Greg Kroah-Hartman Jan 25, 2022

staging: r8188eu: ODM_MAC_EDCA_TURBO is always set

The ODM_MAC_EDCA_TURBO flag is always set for chips that are supported by
this driver. Remove the flag and the one place where it's checked.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220108124959.313215-2-martin@kaiser.cx

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8765a5bc

drivers/staging/r8188eu/hal/odm.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -563,9 +563,6 @@ static void odm_EdcaTurboCheck(struct odm_dm_struct *pDM_Odm)
	struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;		struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv;
	struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;		struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;

	if (!(pDM_Odm->SupportAbility & ODM_MAC_EDCA_TURBO))
	return;

	if (pregpriv->wifi_spec == 1)		if (pregpriv->wifi_spec == 1)
	goto dm_CheckEdcaTurbo_EXIT;		goto dm_CheckEdcaTurbo_EXIT;

drivers/staging/r8188eu/hal/rtl8188e_dm.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,6 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)
	pdmpriv->InitODMFlag = ODM_BB_FA_CNT \|		pdmpriv->InitODMFlag = ODM_BB_FA_CNT \|
	ODM_BB_RSSI_MONITOR \|		ODM_BB_RSSI_MONITOR \|
	ODM_BB_CCK_PD \|		ODM_BB_CCK_PD \|
	ODM_MAC_EDCA_TURBO \|
	ODM_RF_CALIBRATION \|		ODM_RF_CALIBRATION \|
	ODM_RF_TX_PWR_TRACK;		ODM_RF_TX_PWR_TRACK;
	if (hal_data->AntDivCfg)		if (hal_data->AntDivCfg)

drivers/staging/r8188eu/include/odm.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -154,9 +154,6 @@ enum odm_ability_def {
	ODM_BB_ANT_DIV = BIT(6),		ODM_BB_ANT_DIV = BIT(6),
	ODM_BB_PWR_TRA = BIT(8),		ODM_BB_PWR_TRA = BIT(8),

	/* MAC DM section BIT 16-23 */
	ODM_MAC_EDCA_TURBO = BIT(16),

	/* RF ODM section BIT 24-31 */		/* RF ODM section BIT 24-31 */
	ODM_RF_TX_PWR_TRACK = BIT(24),		ODM_RF_TX_PWR_TRACK = BIT(24),
	ODM_RF_CALIBRATION = BIT(26),		ODM_RF_CALIBRATION = BIT(26),