Commit 0bb8ece4 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_PNO_SUPPORT 



Remove conditional code blocks checked by unused CONFIG_PNO_SUPPORT

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/a8ba6c7996ba3f08054c433860be2de66b25d942.1615744948.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+0 −18
Original line number Diff line number Diff line
@@ -1149,29 +1149,11 @@ void rtw_init_pwrctrl_priv(struct adapter *padapter) 


	pwrctrlpriv->wowlan_mode = false;

	pwrctrlpriv->wowlan_ap_mode = false;



#ifdef CONFIG_PNO_SUPPORT

	pwrctrlpriv->pno_inited = false;

	pwrctrlpriv->pnlo_info = NULL;

	pwrctrlpriv->pscan_info = NULL;

	pwrctrlpriv->pno_ssid_list = NULL;

	pwrctrlpriv->pno_in_resume = true;

#endif

}





void rtw_free_pwrctrl_priv(struct adapter *adapter)

{

#ifdef CONFIG_PNO_SUPPORT

	if (pwrctrlpriv->pnlo_info)

		printk("****** pnlo_info memory leak********\n");



	if (pwrctrlpriv->pscan_info)

		printk("****** pscan_info memory leak********\n");



	if (pwrctrlpriv->pno_ssid_list)

		printk("****** pno_ssid_list memory leak********\n");

#endif

}



inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms)

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+0 −8
Original line number Diff line number Diff line
@@ -2189,11 +2189,3 @@ void rtw_set_sec_pn(struct adapter *padapter) 
}

#endif /* CONFIG_WOWLAN */

#ifdef CONFIG_PNO_SUPPORT

#define	CSCAN_TLV_TYPE_SSID_IE	'S'

#define CIPHER_IE "key_mgmt ="

#define CIPHER_NONE "NONE"

#define CIPHER_WPA_PSK "WPA-PSK"

#define CIPHER_WPA_EAP "WPA-EAP IEEE8021X"



#endif /* CONFIG_PNO_SUPPORT */

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+0 −269
Original line number Diff line number Diff line
@@ -462,125 +462,6 @@ static void ConstructARPResponse( 
	}

}



#ifdef CONFIG_PNO_SUPPORT

static void ConstructPnoInfo(

	struct adapter *padapter, u8 *pframe, u32 *pLength

)

{



	struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);



	u8 *pPnoInfoPkt = pframe;

	pPnoInfoPkt = (u8 *)(pframe + *pLength);

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->ssid_num, 4);



	*pLength += 4;

	pPnoInfoPkt += 4;

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->fast_scan_period, 4);



	*pLength += 4;

	pPnoInfoPkt += 4;

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->fast_scan_iterations, 4);



	*pLength += 4;

	pPnoInfoPkt += 4;

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->slow_scan_period, 4);



	*pLength += 4;

	pPnoInfoPkt += 4;

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->ssid_length,

			MAX_PNO_LIST_COUNT);



	*pLength += MAX_PNO_LIST_COUNT;

	pPnoInfoPkt += MAX_PNO_LIST_COUNT;

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->ssid_cipher_info,

			MAX_PNO_LIST_COUNT);



	*pLength += MAX_PNO_LIST_COUNT;

	pPnoInfoPkt += MAX_PNO_LIST_COUNT;

	memcpy(pPnoInfoPkt, &pwrctl->pnlo_info->ssid_channel_info,

			MAX_PNO_LIST_COUNT);



	*pLength += MAX_PNO_LIST_COUNT;

	pPnoInfoPkt += MAX_PNO_LIST_COUNT;

}



static void ConstructSSIDList(

	struct adapter *padapter, u8 *pframe, u32 *pLength

)

{

	int i = 0;

	u8 *pSSIDListPkt = pframe;

	struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);



	pSSIDListPkt = (u8 *)(pframe + *pLength);



	for (i = 0; i < pwrctl->pnlo_info->ssid_num ; i++) {

		memcpy(pSSIDListPkt, &pwrctl->pno_ssid_list->node[i].SSID,

			pwrctl->pnlo_info->ssid_length[i]);



		*pLength += WLAN_SSID_MAXLEN;

		pSSIDListPkt += WLAN_SSID_MAXLEN;

	}

}



static void ConstructScanInfo(

	struct adapter *padapter, u8 *pframe, u32 *pLength

)

{

	int i = 0;

	u8 *pScanInfoPkt = pframe;

	struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);



	pScanInfoPkt = (u8 *)(pframe + *pLength);



	memcpy(pScanInfoPkt, &pwrctl->pscan_info->channel_num, 1);



	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->orig_ch, 1);





	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->orig_bw, 1);





	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->orig_40_offset, 1);



	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->orig_80_offset, 1);



	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->periodScan, 1);



	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->period_scan_time, 1);



	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->enableRFE, 1);



	*pLength += 1;

	pScanInfoPkt += 1;

	memcpy(pScanInfoPkt, &pwrctl->pscan_info->rfe_type, 8);



	*pLength += 8;

	pScanInfoPkt += 8;



	for (i = 0; i < MAX_SCAN_LIST_COUNT; i++) {

		memcpy(pScanInfoPkt, &pwrctl->pscan_info->ssid_channel_info[i], 4);

		*pLength += 4;

		pScanInfoPkt += 4;

	}

}

#endif



#ifdef CONFIG_GTK_OL

static void ConstructGTKResponse(

	struct adapter *padapter, u8 *pframe, u32 *pLength
@@ -666,48 +547,6 @@ static void ConstructGTKResponse( 
}

#endif /* CONFIG_GTK_OL */



#ifdef CONFIG_PNO_SUPPORT

static void ConstructProbeReq(struct adapter *padapter, u8 *pframe, u32 *pLength)

{

	struct ieee80211_hdr *pwlanhdr;

	u16 *fctrl;

	u32 pktlen;

	unsigned char *mac;

	unsigned char bssrate[NumRates];

	int bssrate_len = 0;

	u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};



	pwlanhdr = (struct ieee80211_hdr *)pframe;

	mac = myid(&(padapter->eeprompriv));



	fctrl = &(pwlanhdr->frame_control);

	*(fctrl) = 0;



	/* broadcast probe request frame */

	memcpy(pwlanhdr->addr1, bc_addr, ETH_ALEN);

	memcpy(pwlanhdr->addr3, bc_addr, ETH_ALEN);



	memcpy(pwlanhdr->addr2, mac, ETH_ALEN);



	SetSeqNum(pwlanhdr, 0);

	SetFrameSubType(pframe, WIFI_PROBEREQ);



	pktlen = sizeof(struct ieee80211_hdr_3addr);

	pframe += pktlen;



	pframe = rtw_set_ie(pframe, WLAN_EID_SSID, 0, NULL, &pktlen);



	get_rate_set(padapter, bssrate, &bssrate_len);



	if (bssrate_len > 8) {

		pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, 8, bssrate, &pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_EXT_SUPP_RATES, (bssrate_len - 8), (bssrate + 8), &pktlen);

	} else

		pframe = rtw_set_ie(pframe, WLAN_EID_SUPP_RATES, bssrate_len, bssrate, &pktlen);



	*pLength = pktlen;

}

#endif /* CONFIG_PNO_SUPPORT */

#endif /* CONFIG_WOWLAN */



#ifdef CONFIG_AP_WOWLAN
@@ -875,15 +714,6 @@ static void rtl8723b_set_FwAoacRsvdPage_cmd(struct adapter *padapter, struct RSV 
		RT_PRINT_DATA(_module_hal_init_c_, _drv_always_, "u1H2CAoacRsvdPageParm:", u1H2CAoacRsvdPageParm, H2C_AOAC_RSVDPAGE_LOC_LEN);

		FillH2CCmd8723B(padapter, H2C_8723B_AOAC_RSVD_PAGE, H2C_AOAC_RSVDPAGE_LOC_LEN, u1H2CAoacRsvdPageParm);

	} else {

#ifdef CONFIG_PNO_SUPPORT

		if (!pwrpriv->pno_in_resume) {

			DBG_871X("NLO_INFO =%d\n", rsvdpageloc->LocPNOInfo);

			memset(&u1H2CAoacRsvdPageParm, 0, sizeof(u1H2CAoacRsvdPageParm));

			SET_H2CCMD_AOAC_RSVDPAGE_LOC_NLO_INFO(u1H2CAoacRsvdPageParm, rsvdpageloc->LocPNOInfo);

			FillH2CCmd8723B(padapter, H2C_AOAC_RSVDPAGE3, H2C_AOAC_RSVDPAGE_LOC_LEN, u1H2CAoacRsvdPageParm);

			msleep(10);

		}

#endif

	}



#endif /*  CONFIG_WOWLAN */
@@ -1183,11 +1013,6 @@ static void rtl8723b_set_FwWoWlanCtrl_Cmd(struct adapter *padapter, u8 bFuncEn) 
	u8 gpio_high_active = 0; /* 0: low active, 1: high active */

	u8 magic_pkt = 0;



#ifdef CONFIG_PNO_SUPPORT

	if (!ppwrpriv->wowlan_pno_enable)

		magic_pkt = 1;

#endif



	if (psecpriv->dot11PrivacyAlgrthm == _WEP40_ || psecpriv->dot11PrivacyAlgrthm == _WEP104_)

		hw_unicast = 1;
@@ -1240,28 +1065,9 @@ static void rtl8723b_set_FwRemoteWakeCtrl_Cmd(struct adapter *padapter, u8 benab 
		else

			SET_H2CCMD_REMOTE_WAKE_CTRL_ARP_ACTION(u1H2CRemoteWakeCtrlParm, 1);

	}

#ifdef CONFIG_PNO_SUPPORT

	else {

		SET_H2CCMD_REMOTE_WAKECTRL_ENABLE(u1H2CRemoteWakeCtrlParm, benable);

		SET_H2CCMD_REMOTE_WAKE_CTRL_NLO_OFFLOAD_EN(u1H2CRemoteWakeCtrlParm, benable);

	}

#endif

	RT_PRINT_DATA(_module_hal_init_c_, _drv_always_, "u1H2CRemoteWakeCtrlParm:", u1H2CRemoteWakeCtrlParm, H2C_REMOTE_WAKE_CTRL_LEN);

	FillH2CCmd8723B(padapter, H2C_8723B_REMOTE_WAKE_CTRL,

		H2C_REMOTE_WAKE_CTRL_LEN, u1H2CRemoteWakeCtrlParm);

#ifdef CONFIG_PNO_SUPPORT

	if (ppwrpriv->wowlan_pno_enable && !ppwrpriv->pno_in_resume) {

		res = rtw_read8(padapter, REG_PNO_STATUS);

		DBG_871X("cmd: 0x81 REG_PNO_STATUS: 0x%02x\n", res);

		while (!(res&BIT(7)) && count < 25) {

			DBG_871X("[%d] cmd: 0x81 REG_PNO_STATUS: 0x%02x\n", count, res);

			res = rtw_read8(padapter, REG_PNO_STATUS);

			count++;

			msleep(2);

		}

		DBG_871X("cmd: 0x81 REG_PNO_STATUS: 0x%02x\n", res);

	}

#endif /* CONFIG_PNO_SUPPORT */

}



static void rtl8723b_set_FwAOACGlobalInfo_Cmd(struct adapter *padapter,  u8 group_alg, u8 pairwise_alg)
@@ -1278,26 +1084,6 @@ static void rtl8723b_set_FwAOACGlobalInfo_Cmd(struct adapter *padapter, u8 grou 
	FillH2CCmd8723B(padapter, H2C_8723B_AOAC_GLOBAL_INFO, H2C_AOAC_GLOBAL_INFO_LEN, u1H2CAOACGlobalInfoParm);

}



#ifdef CONFIG_PNO_SUPPORT

static void rtl8723b_set_FwScanOffloadInfo_cmd(struct adapter *padapter, struct RSVDPAGE_LOC *rsvdpageloc, u8 enable)

{

	u8 u1H2CScanOffloadInfoParm[H2C_SCAN_OFFLOAD_CTRL_LEN] = {0};



	DBG_871X("%s: loc_probe_packet:%d, loc_scan_info: %d loc_ssid_info:%d\n",

		__func__, rsvdpageloc->LocProbePacket, rsvdpageloc->LocScanInfo, rsvdpageloc->LocSSIDInfo);



	SET_H2CCMD_AOAC_NLO_FUN_EN(u1H2CScanOffloadInfoParm, enable);

	SET_H2CCMD_AOAC_RSVDPAGE_LOC_SCAN_INFO(u1H2CScanOffloadInfoParm, rsvdpageloc->LocScanInfo);

	SET_H2CCMD_AOAC_RSVDPAGE_LOC_PROBE_PACKET(u1H2CScanOffloadInfoParm, rsvdpageloc->LocProbePacket);

	SET_H2CCMD_AOAC_RSVDPAGE_LOC_SSID_INFO(u1H2CScanOffloadInfoParm, rsvdpageloc->LocSSIDInfo);



	RT_PRINT_DATA(_module_hal_init_c_, _drv_always_, "u1H2CScanOffloadInfoParm:", u1H2CScanOffloadInfoParm, H2C_SCAN_OFFLOAD_CTRL_LEN);

	FillH2CCmd8723B(padapter, H2C_8723B_D0_SCAN_OFFLOAD_INFO, H2C_SCAN_OFFLOAD_CTRL_LEN, u1H2CScanOffloadInfoParm);



	msleep(20);

}

#endif /* CONFIG_PNO_SUPPORT */



void rtl8723b_set_wowlan_cmd(struct adapter *padapter, u8 enable)

{

	struct security_priv *psecpriv = &padapter->securitypriv;
@@ -1656,55 +1442,8 @@ static void rtl8723b_set_FwRsvdPagePkt( 
	} else

#endif /* CONFIG_WOWLAN */

	{

#ifdef CONFIG_PNO_SUPPORT

		if (!pwrctl->pno_in_resume && pwrctl->pno_inited) {

			/* Probe Request */

			RsvdPageLoc.LocProbePacket = TotalPageNum;

			ConstructProbeReq(

				padapter,

				&ReservedPagePacket[BufIndex],

				&ProbeReqLength);



			rtl8723b_fill_fake_txdesc(padapter,

				&ReservedPagePacket[BufIndex-TxDescLen],

				ProbeReqLength, false, false, false);

			CurtPktPageNum =

				(u8)PageNum_128(TxDescLen + ProbeReqLength);



			TotalPageNum += CurtPktPageNum;



			BufIndex += (CurtPktPageNum*PageSize);



			/* PNO INFO Page */

			RsvdPageLoc.LocPNOInfo = TotalPageNum;

			ConstructPnoInfo(padapter, &ReservedPagePacket[BufIndex-TxDescLen], &PNOLength);



			CurtPktPageNum = (u8)PageNum_128(PNOLength);

			TotalPageNum += CurtPktPageNum;

			BufIndex += (CurtPktPageNum*PageSize);



			/* SSID List Page */

			RsvdPageLoc.LocSSIDInfo = TotalPageNum;

			ConstructSSIDList(padapter, &ReservedPagePacket[BufIndex-TxDescLen], &SSIDLegnth);

			CurtPktPageNum = (u8)PageNum_128(SSIDLegnth);

			TotalPageNum += CurtPktPageNum;

			BufIndex += (CurtPktPageNum*PageSize);



			/* Scan Info Page */

			RsvdPageLoc.LocScanInfo = TotalPageNum;

			ConstructScanInfo(padapter, &ReservedPagePacket[BufIndex-TxDescLen], &ScanInfoLength);

			CurtPktPageNum = (u8)PageNum_128(ScanInfoLength);

			TotalPageNum += CurtPktPageNum;

			BufIndex += (CurtPktPageNum*PageSize);



			TotalPacketLen = BufIndex + ScanInfoLength;

		} else {

		TotalPacketLen = BufIndex + BTQosNullLength;

	}

#else /* CONFIG_PNO_SUPPORT */

		TotalPacketLen = BufIndex + BTQosNullLength;

#endif

	}



	if (TotalPacketLen > MaxRsvdPageBufSize) {

		DBG_871X("%s(): ERROR: The rsvd page size is not enough!!TotalPacketLen %d, MaxRsvdPageBufSize %d\n", __func__,
@@ -1725,14 +1464,6 @@ static void rtl8723b_set_FwRsvdPagePkt( 
		rtl8723b_set_FwAoacRsvdPage_cmd(padapter, &RsvdPageLoc);

	} else {

		rtl8723b_set_FwAoacRsvdPage_cmd(padapter, &RsvdPageLoc);

#ifdef CONFIG_PNO_SUPPORT

		if (pwrctl->pno_in_resume)

			rtl8723b_set_FwScanOffloadInfo_cmd(padapter,

					&RsvdPageLoc, 0);

		else

			rtl8723b_set_FwScanOffloadInfo_cmd(padapter,

					&RsvdPageLoc, 1);

#endif

	}

	return;

drivers/staging/rtl8723bs/hal/sdio_halinit.c

+0 −8
Original line number Diff line number Diff line
@@ -1555,14 +1555,6 @@ static void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) 
				if (psta)

					rtl8723b_set_FwMediaStatusRpt_cmd(padapter, RT_MEDIA_CONNECT, psta->mac_id);

			}

#ifdef CONFIG_PNO_SUPPORT

			rtw_write8(padapter, 0x1b8, 0);

			DBG_871X("reset 0x1b8: %d\n", rtw_read8(padapter, 0x1b8));

			rtw_write8(padapter, 0x1b9, 0);

			DBG_871X("reset 0x1b9: %d\n", rtw_read8(padapter, 0x1b9));

			rtw_write8(padapter, REG_PNO_STATUS, 0);

			DBG_871X("reset REG_PNO_STATUS: %d\n", rtw_read8(padapter, REG_PNO_STATUS));

#endif

			break;



		default:

drivers/staging/rtl8723bs/include/hal_com_h2c.h

+0 −17
Original line number Diff line number Diff line
@@ -233,17 +233,6 @@ enum h2c_cmd { 
#ifdef CONFIG_GTK_OL

#define SET_H2CCMD_AOAC_RSVDPAGE_LOC_GTK_EXT_MEM(__pH2CCmd, __Value)		SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+5, 0, 8, __Value)

#endif /* CONFIG_GTK_OL */

#ifdef CONFIG_PNO_SUPPORT

#define SET_H2CCMD_AOAC_RSVDPAGE_LOC_NLO_INFO(__pH2CCmd, __Value)		SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd), 0, 8, __Value)

#endif



#ifdef CONFIG_PNO_SUPPORT

/*  D0_Scan_Offload_Info_0x86 */

#define SET_H2CCMD_AOAC_NLO_FUN_EN(__pH2CCmd, __Value)			SET_BITS_TO_LE_1BYTE((__pH2CCmd), 3, 1, __Value)

#define SET_H2CCMD_AOAC_RSVDPAGE_LOC_PROBE_PACKET(__pH2CCmd, __Value)	SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+1, 0, 8, __Value)

#define SET_H2CCMD_AOAC_RSVDPAGE_LOC_SCAN_INFO(__pH2CCmd, __Value)	SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+2, 0, 8, __Value)

#define SET_H2CCMD_AOAC_RSVDPAGE_LOC_SSID_INFO(__pH2CCmd, __Value)	SET_BITS_TO_LE_1BYTE_8BIT((__pH2CCmd)+3, 0, 8, __Value)

#endif /* CONFIG_PNO_SUPPORT */



/*  */

/*     Structure    -------------------------------------------------- */
@@ -265,12 +254,6 @@ struct RSVDPAGE_LOC { 
#ifdef CONFIG_GTK_OL

	u8 LocGTKEXTMEM;

#endif /* CONFIG_GTK_OL */

#ifdef CONFIG_PNO_SUPPORT

	u8 LocPNOInfo;

	u8 LocScanInfo;

	u8 LocSSIDInfo;

	u8 LocProbePacket;

#endif /* CONFIG_PNO_SUPPORT */

#endif /* CONFIG_WOWLAN */

#ifdef CONFIG_AP_WOWLAN

	u8 LocApOffloadBCN;