staging: rtl8188eu: kill unused hal_data_8188e::fw_ractrl flag (3abf4f98) · Commits · 戴 / test

drivers/staging/rtl8188eu/hal/odm.c

+4 −7

Original line number	Diff line number	Diff line
		@@ -1170,13 +1170,10 @@ void odm_RSSIMonitorCheckCE(struct odm_dm_struct *pDM_Odm)
		}

		for (i = 0; i < sta_cnt; i++) {
		if (PWDB_rssi[i] != (0)) {
		if (pHalData->fw_ractrl) {
		/* Report every sta's RSSI to FW */
		} else {
		ODM_RA_SetRSSI_8188E(
		&(pHalData->odmpriv), (PWDB_rssi[i]&0xFF), (u8)((PWDB_rssi[i]>>16) & 0xFF));
		}
		if (PWDB_rssi[i] != 0) {
		ODM_RA_SetRSSI_8188E(&pHalData->odmpriv,
		PWDB_rssi[i] & 0xFF,
		(PWDB_rssi[i] >> 16) & 0xFF);
		}
		}

drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -127,27 +127,6 @@ exit:
		return ret;
		}

		u8 rtl8188e_set_raid_cmd(struct adapter *adapt, u32 mask)
		{
		u8 buf[3];
		u8 res = _SUCCESS;
		struct hal_data_8188e *haldata = GET_HAL_DATA(adapt);

		if (haldata->fw_ractrl) {

		memset(buf, 0, 3);
		put_unaligned_le32(mask, buf);

		FillH2CCmd_88E(adapt, H2C_DM_MACID_CFG, 3, buf);
		} else {
		DBG_88E("==>%s fw dont support RA\n", __func__);
		res = _FAIL;
		}


		return res;
		}

		/* bitmap[0:27] = tx_rate_bitmap */
		/* bitmap[28:31]= Rate Adaptive id */
		/* arg[0:4] = macid */

drivers/staging/rtl8188eu/hal/usb_halinit.c

+2 −25

Original line number	Diff line number	Diff line
		@@ -743,19 +743,16 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
		if (Adapter->registrypriv.mp_mode == 1) {
		_InitRxSetting(Adapter);
		Adapter->bFWReady = false;
		haldata->fw_ractrl = false;
		} else {
		status = rtl88eu_download_fw(Adapter);

		if (status) {
		DBG_88E("%s: Download Firmware failed!!\n", __func__);
		Adapter->bFWReady = false;
		haldata->fw_ractrl = false;
		return status;
		} else {
		RT_TRACE(_module_hci_hal_init_c_, _drv_info_, ("Initializeadapt8192CSdio(): Download Firmware Success!!\n"));
		Adapter->bFWReady = true;
		haldata->fw_ractrl = false;
		}
		}
		rtl8188e_InitializeFirmwareVars(Adapter);
		@@ -2016,28 +2013,9 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l

		init_rate = get_highest_rate_idx(mask)&0x3f;

		if (haldata->fw_ractrl) {
		u8 arg;
		ODM_RA_UpdateRateInfo_8188E(&haldata->odmpriv, mac_id,
		raid, mask, shortGIrate);

		arg = mac_id & 0x1f;/* MACID */
		arg \|= BIT(7);
		if (shortGIrate)
		arg \|= BIT(5);
		mask \|= ((raid << 28) & 0xf0000000);
		DBG_88E("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg);
		psta->ra_mask = mask;
		mask \|= ((raid << 28) & 0xf0000000);

		/* to do ,for 8188E-SMIC */
		rtl8188e_set_raid_cmd(adapt, mask);
		} else {
		ODM_RA_UpdateRateInfo_8188E(&(haldata->odmpriv),
		mac_id,
		raid,
		mask,
		shortGIrate
		);
		}
		/* set ra_id */
		psta->raid = raid;
		psta->init_rate = init_rate;
		@@ -2087,7 +2065,6 @@ static void rtl8188eu_init_default_value(struct adapter *adapt)
		pwrctrlpriv = &adapt->pwrctrlpriv;

		/* init default value */
		haldata->fw_ractrl = false;
		if (!pwrctrlpriv->bkeepfwalive)
		haldata->LastHMEBoxNum = 0;

drivers/staging/rtl8188eu/include/rtl8188e_cmd.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -107,7 +107,6 @@ struct P2P_PS_CTWPeriod_t {
		/* host message to firmware cmd */
		void rtl8188e_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode);
		void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus);
		u8 rtl8188e_set_raid_cmd(struct adapter *padapter, u32 mask);
		void rtl8188e_Add_RateATid(struct adapter *padapter, u32 bitmap, u8 arg,
		u8 rssi_level);

drivers/staging/rtl8188eu/include/rtl8188e_hal.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,6 @@ struct hal_data_8188e {
		/* for host message to fw */
		u8 LastHMEBoxNum;

		u8 fw_ractrl;
		u8 RegTxPause;
		/* Beacon function related global variable. */
		u32 RegBcnCtrlVal;

Admin message