Commit b7743b82 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_CMCC_TEST 



remove conditional code blocks checked by unused
CONFIG_CMCC_TEST

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/c5f84efa3c593a897f0498568a41d8638f7f0f8a.1615907632.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+0 −19
Original line number Diff line number Diff line
@@ -2115,16 +2115,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_l 
	rate_bitmap = hal_btcoex_GetRaMask(padapter);

	mask &= ~rate_bitmap;



#ifdef CONFIG_CMCC_TEST

	if (pmlmeext->cur_wireless_mode & WIRELESS_11G) {

		if (mac_id == 0) {

			DBG_871X("CMCC_BT update raid entry, mask = 0x%x\n", mask);

			mask &= 0xffffff00; /* disable CCK & <24M OFDM rate for 11G mode for CMCC */

			DBG_871X("CMCC_BT update raid entry, mask = 0x%x\n", mask);

		}

	}

#endif



	if (pHalData->fw_ractrl) {

		rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mode, shortGIrate, mask);

	}
@@ -3082,10 +3072,6 @@ static void rtl8723b_fill_default_txdesc( 
				ptxdesc->data_ldpc = 1;

			if (pattrib->stbc)

				ptxdesc->data_stbc = 1;



#ifdef CONFIG_CMCC_TEST

			ptxdesc->data_short = 1; /* use cck short premble */

#endif

		} else {

			/*  EAP data packet and ARP packet. */

			/*  Use the 1M data rate to send the EAP/ARP packet. */
@@ -3767,11 +3753,6 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) 
		BrateCfg &= rrsr_2g_allow_mask;

		masked = BrateCfg;



		#ifdef CONFIG_CMCC_TEST

		BrateCfg |= (RRSR_11M|RRSR_5_5M|RRSR_1M); /* use 11M to send ACK */

		BrateCfg |= (RRSR_24M|RRSR_18M|RRSR_12M); /* CMCC_OFDM_ACK 12/18/24M */

		#endif



		/* IOT consideration */

		if (mlmext_info->assoc_AP_vendor == HT_IOT_PEER_CISCO) {

			/* if peer is cisco and didn't use ofdm rate, we enable 6M ack */