Commit dc365d2c 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_AP_WOWLAN 



remove conditional code blocks checked by unused CONFIG_AP_WOWLAN

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Changes in v2:
	rebase of conflicting code with public tree

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/20210316140359.GA2858@agape.jhs


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

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

+0 −35
Original line number Diff line number Diff line
@@ -350,17 +350,8 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) 
	struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);



#ifdef CONFIG_AP_WOWLAN

	if (pwrpriv->bInSuspend && pwrpriv->wowlan_mode)

		return true;

	else if (pwrpriv->bInSuspend && pwrpriv->wowlan_ap_mode)

		return true;

	else if (pwrpriv->bInSuspend)

		return false;

#else

	if (pwrpriv->bInSuspend)

		return false;

#endif



	curr_time = jiffies;
@@ -391,9 +382,6 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) 
void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode, const char *msg)

{

	struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);

#ifdef CONFIG_AP_WOWLAN

	struct debug_priv *pdbgpriv = &padapter->dvobj->drv_dbg;

#endif



	RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_,

			 ("%s: PowerMode =%d Smart_PS =%d\n",
@@ -422,29 +410,6 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a 
			pwrpriv->pwr_mode = ps_mode;

			rtw_set_rpwm(padapter, PS_STATE_S4);



#ifdef CONFIG_AP_WOWLAN

			if (pwrpriv->wowlan_mode || pwrpriv->wowlan_ap_mode) {

				unsigned long start_time;

				u32 delay_ms;

				u8 val8;

				delay_ms = 20;

				start_time = jiffies;

				do {

					rtw_hal_get_hwreg(padapter, HW_VAR_SYS_CLKR, &val8);

					if (!(val8 & BIT(4))) { /* 0x08 bit4 = 1 --> in 32k, bit4 = 0 --> leave 32k */

						pwrpriv->cpwm = PS_STATE_S4;

						break;

					}

					if (jiffies_to_msecs(jiffies - start_time) > delay_ms) {

						DBG_871X("%s: Wait for FW 32K leave more than %u ms!!!\n",

								__func__, delay_ms);

						pdbgpriv->dbg_wow_leave_ps_fail_cnt++;

						break;

					}

					msleep(1);

				} while (1);

			}

#endif

			rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));

			pwrpriv->bFwCurrentInPSMode = false;

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+0 −31
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ 
#include <rtw_debug.h>

#include <hal_com_h2c.h>



#ifdef CONFIG_AP_WOWLAN

#include <linux/inetdevice.h>

#endif



static unsigned char ARTHEROS_OUI1[] = {0x00, 0x03, 0x7f};

static unsigned char ARTHEROS_OUI2[] = {0x00, 0x13, 0x74};
@@ -2113,30 +2109,3 @@ int rtw_config_gpio(struct net_device *netdev, int gpio_num, bool isOutput) 
EXPORT_SYMBOL(rtw_config_gpio);

#endif

#ifdef CONFIG_AP_WOWLAN

void rtw_get_current_ip_address(struct adapter *padapter, u8 *pcurrentip)

{

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	struct in_device *my_ip_ptr = padapter->pnetdev->ip_ptr;

	u8 ipaddress[4];



	if ((pmlmeinfo->state & WIFI_FW_LINKING_STATE) ||

			pmlmeinfo->state & WIFI_FW_AP_STATE) {

		if (my_ip_ptr) {

			struct in_ifaddr *my_ifa_list = my_ip_ptr->ifa_list;



			if (my_ifa_list) {

				ipaddress[0] = my_ifa_list->ifa_address & 0xFF;

				ipaddress[1] = (my_ifa_list->ifa_address >> 8) & 0xFF;

				ipaddress[2] = (my_ifa_list->ifa_address >> 16) & 0xFF;

				ipaddress[3] = my_ifa_list->ifa_address >> 24;

				DBG_871X("%s: %d.%d.%d.%d ==========\n", __func__,

						ipaddress[0], ipaddress[1], ipaddress[2], ipaddress[3]);

				memcpy(pcurrentip, ipaddress, 4);

			}

		}

	}

}

#endif

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+0 −339
Original line number Diff line number Diff line
@@ -312,119 +312,6 @@ static void ConstructNullFunctionData( 
	*pLength = pktlen;

}



#ifdef CONFIG_AP_WOWLAN

static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr, bool bHideSSID)

{

	struct ieee80211_hdr *pwlanhdr;

	u16 *fctrl;

	u8 *mac, *bssid;

	u32 pktlen;

	struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);

	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);

	u8 *pwps_ie;

	uint wps_ielen;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	/* DBG_871X("%s\n", __func__); */



	pwlanhdr = (struct ieee80211_hdr *)pframe;



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

	bssid = cur_network->MacAddress;



	fctrl = &(pwlanhdr->frame_control);

	*(fctrl) = 0;

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

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

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



	DBG_871X("%s FW Mac Addr:%pM\n", __func__, MAC_ARG(mac));

	DBG_871X("%s FW IP Addr:%pI4\n", __func__, IP_ARG(StaAddr));



	SetSeqNum(pwlanhdr, 0);

	SetFrameSubType(fctrl, WIFI_PROBERSP);



	pktlen = sizeof(struct ieee80211_hdr_3addr);

	pframe += pktlen;



	if (cur_network->IELength > MAX_IE_SZ)

		return;



	pwps_ie = rtw_get_wps_ie(cur_network->IEs+_FIXED_IE_LENGTH_,

			cur_network->IELength-_FIXED_IE_LENGTH_, NULL, &wps_ielen);



	/* inerset & update wps_probe_resp_ie */

	if (pmlmepriv->wps_probe_resp_ie && pwps_ie && (wps_ielen > 0)) {

		uint wps_offset, remainder_ielen;

		u8 *premainder_ie;



		wps_offset = (uint)(pwps_ie - cur_network->IEs);



		premainder_ie = pwps_ie + wps_ielen;



		remainder_ielen = cur_network->IELength - wps_offset - wps_ielen;



		memcpy(pframe, cur_network->IEs, wps_offset);

		pframe += wps_offset;

		pktlen += wps_offset;



		wps_ielen = (uint)pmlmepriv->wps_probe_resp_ie[1];/* to get ie data len */

		if ((wps_offset+wps_ielen+2) <= MAX_IE_SZ) {

			memcpy(pframe, pmlmepriv->wps_probe_resp_ie, wps_ielen+2);

			pframe += wps_ielen+2;

			pktlen += wps_ielen+2;

		}



		if ((wps_offset+wps_ielen+2+remainder_ielen) <= MAX_IE_SZ) {

			memcpy(pframe, premainder_ie, remainder_ielen);

			pframe += remainder_ielen;

			pktlen += remainder_ielen;

		}

	} else {

		memcpy(pframe, cur_network->IEs, cur_network->IELength);

		pframe += cur_network->IELength;

		pktlen += cur_network->IELength;

	}



	/* retrieve SSID IE from cur_network->Ssid */

	{

		u8 *ssid_ie;

		signed int ssid_ielen;

		signed int ssid_ielen_diff;

		u8 buf[MAX_IE_SZ];

		u8 *ies = pframe + sizeof(struct ieee80211_hdr_3addr);



		ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, WLAN_EID_SSID, &ssid_ielen,

					(pframe-ies)-_FIXED_IE_LENGTH_);



		ssid_ielen_diff = cur_network->Ssid.SsidLength - ssid_ielen;



		if (ssid_ie &&	cur_network->Ssid.SsidLength) {

			uint remainder_ielen;

			u8 *remainder_ie;

			remainder_ie = ssid_ie+2;

			remainder_ielen = (pframe-remainder_ie);



			if (remainder_ielen > MAX_IE_SZ) {

				DBG_871X_LEVEL(_drv_warning_, FUNC_ADPT_FMT" remainder_ielen > MAX_IE_SZ\n", FUNC_ADPT_ARG(padapter));

				remainder_ielen = MAX_IE_SZ;

			}



			memcpy(buf, remainder_ie, remainder_ielen);

			memcpy(remainder_ie+ssid_ielen_diff, buf, remainder_ielen);

			*(ssid_ie+1) = cur_network->Ssid.SsidLength;

			memcpy(ssid_ie+2, cur_network->Ssid.Ssid, cur_network->Ssid.SsidLength);

			pframe += ssid_ielen_diff;

			pktlen += ssid_ielen_diff;

		}

	}



	*pLength = pktlen;



}

#endif /*  CONFIG_AP_WOWLAN */



/*

 * To check if reserved page content is destroyed by beacon because beacon

 * is too large.
@@ -457,42 +344,6 @@ static void rtl8723b_set_FwAoacRsvdPage_cmd(struct adapter *padapter, struct rsv 
{

}



#ifdef CONFIG_AP_WOWLAN

static void rtl8723b_set_ap_wow_rsvdpage_cmd(

	struct adapter *padapter, struct RSVDPAGE_LOC *rsvdpageloc

)

{

	u8 header;

	u8 rsvdparm[H2C_AOAC_RSVDPAGE_LOC_LEN] = {0};



	header = rtw_read8(padapter, REG_BCNQ_BDNY);



	DBG_871X("%s: beacon: %d, probeRsp: %d, header:0x%02x\n", __func__,

			rsvdpageloc->LocApOffloadBCN,

			rsvdpageloc->LocProbeRsp,

			header);



	SET_H2CCMD_AP_WOWLAN_RSVDPAGE_LOC_BCN(rsvdparm,

			rsvdpageloc->LocApOffloadBCN + header);



	FillH2CCmd8723B(padapter, H2C_8723B_BCN_RSVDPAGE,

			H2C_BCN_RSVDPAGE_LEN, rsvdparm);



	msleep(10);



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



	SET_H2CCMD_AP_WOWLAN_RSVDPAGE_LOC_ProbeRsp(

			rsvdparm,

			rsvdpageloc->LocProbeRsp + header);



	FillH2CCmd8723B(padapter, H2C_8723B_PROBERSP_RSVDPAGE,

			H2C_PROBERSP_RSVDPAGE_LEN, rsvdparm);



	msleep(10);

}

#endif /* CONFIG_AP_WOWLAN */



void rtl8723b_set_FwMediaStatusRpt_cmd(struct adapter *padapter, u8 mstatus, u8 macid)

{

	u8 u1H2CMediaStatusRptParm[H2C_MEDIA_STATUS_RPT_LEN] = {0};
@@ -698,64 +549,6 @@ void rtl8723b_set_FwPwrModeInIPS_cmd(struct adapter *padapter, u8 cmd_param) 
	FillH2CCmd8723B(padapter, H2C_8723B_FWLPS_IN_IPS_, 1, &cmd_param);

}



#ifdef CONFIG_AP_WOWLAN

static void rtl8723b_set_FwAPWoWlanCtrl_Cmd(struct adapter *padapter, u8 bFuncEn)

{

	u8 u1H2CAPWoWlanCtrlParm[H2C_WOWLAN_LEN] = {0};

	u8 gpionum = 0, gpio_dur = 0;

	u8 gpio_high_active = 1; /* 0: low active, 1: high active */

	u8 gpio_pulse = bFuncEn;



	DBG_871X("%s(): bFuncEn =%d\n", __func__, bFuncEn);



	if (bFuncEn)

		gpio_dur = 16;

	else

		gpio_dur = 0;



	SET_H2CCMD_AP_WOW_GPIO_CTRL_INDEX(u1H2CAPWoWlanCtrlParm,

			gpionum);

	SET_H2CCMD_AP_WOW_GPIO_CTRL_PLUS(u1H2CAPWoWlanCtrlParm,

			gpio_pulse);

	SET_H2CCMD_AP_WOW_GPIO_CTRL_HIGH_ACTIVE(u1H2CAPWoWlanCtrlParm,

			gpio_high_active);

	SET_H2CCMD_AP_WOW_GPIO_CTRL_EN(u1H2CAPWoWlanCtrlParm,

			bFuncEn);

	SET_H2CCMD_AP_WOW_GPIO_CTRL_DURATION(u1H2CAPWoWlanCtrlParm,

			gpio_dur);



	FillH2CCmd8723B(padapter, H2C_8723B_AP_WOW_GPIO_CTRL,

			H2C_AP_WOW_GPIO_CTRL_LEN, u1H2CAPWoWlanCtrlParm);

}



static void rtl8723b_set_Fw_AP_Offload_Cmd(struct adapter *padapter, u8 bFuncEn)

{

	u8 u1H2CAPOffloadCtrlParm[H2C_WOWLAN_LEN] = {0};



	DBG_871X("%s(): bFuncEn =%d\n", __func__, bFuncEn);



	SET_H2CCMD_AP_WOWLAN_EN(u1H2CAPOffloadCtrlParm, bFuncEn);



	FillH2CCmd8723B(padapter, H2C_8723B_AP_OFFLOAD,

			H2C_AP_OFFLOAD_LEN, u1H2CAPOffloadCtrlParm);

}



void rtl8723b_set_ap_wowlan_cmd(struct adapter *padapter, u8 enable)

{

	DBG_871X_LEVEL(_drv_always_, "+%s()+: enable =%d\n", __func__, enable);

	if (enable) {

		rtl8723b_set_FwJoinBssRpt_cmd(padapter, RT_MEDIA_CONNECT);

		issue_beacon(padapter, 0);

	}



	rtl8723b_set_FwAPWoWlanCtrl_Cmd(padapter, enable);

	msleep(10);

	rtl8723b_set_Fw_AP_Offload_Cmd(padapter, enable);

	msleep(10);

	DBG_871X_LEVEL(_drv_always_, "-%s()-\n", __func__);

}

#endif /* CONFIG_AP_WOWLAN */



/*

 * Description: Fill the reserved packets that FW will use to RSVD page.

 * Now we just send 4 types packet to rsvd page.
@@ -928,134 +721,9 @@ static void rtl8723b_set_FwRsvdPagePkt( 
	rtw_free_xmitframe(pxmitpriv, pcmdframe);

}



#ifdef CONFIG_AP_WOWLAN

/*

 * Description: Fill the reserved packets that FW will use to RSVD page.

 * Now we just send 2 types packet to rsvd page. (1)Beacon, (2)ProbeRsp.

 *

 * Input: bDLFinished

 *

 * false: At the first time we will send all the packets as a large packet to

 * Hw, so we need to set the packet length to total length.

 *

 * true: At the second time, we should send the first packet (default:beacon)

 * to Hw again and set the length in descriptor to the real beacon length.

 */

/* 2009.10.15 by tynli. */

static void rtl8723b_set_AP_FwRsvdPagePkt(

	struct adapter *padapter, bool bDLFinished

)

{

	struct hal_com_data *pHalData;

	struct xmit_frame *pcmdframe;

	struct pkt_attrib *pattrib;

	struct xmit_priv *pxmitpriv;

	struct mlme_ext_priv *pmlmeext;

	struct mlme_ext_info *pmlmeinfo;

	struct pwrctrl_priv *pwrctl;

	u32 BeaconLength = 0, ProbeRspLength = 0;

	u8 *ReservedPagePacket;

	u8 TxDescLen = TXDESC_SIZE, TxDescOffset = TXDESC_OFFSET;

	u8 TotalPageNum = 0, CurtPktPageNum = 0, RsvdPageNum = 0;

	u8 currentip[4];

	u16 BufIndex, PageSize = 128;

	u32 TotalPacketLen = 0, MaxRsvdPageBufSize = 0;

	struct RSVDPAGE_LOC RsvdPageLoc;



	/* DBG_871X("%s---->\n", __func__); */

	DBG_8192C("+" FUNC_ADPT_FMT ": iface_type =%d\n",

		FUNC_ADPT_ARG(padapter), get_iface_type(padapter));



	pHalData = GET_HAL_DATA(padapter);

	pxmitpriv = &padapter->xmitpriv;

	pmlmeext = &padapter->mlmeextpriv;

	pmlmeinfo = &pmlmeext->mlmext_info;

	pwrctl = adapter_to_pwrctl(padapter);



	RsvdPageNum = BCNQ_PAGE_NUM_8723B + AP_WOWLAN_PAGE_NUM_8723B;

	MaxRsvdPageBufSize = RsvdPageNum*PageSize;



	pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);

	if (!pcmdframe) {

		DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__);

		return;

	}



	ReservedPagePacket = pcmdframe->buf_addr;

	memset(&RsvdPageLoc, 0, sizeof(struct RSVDPAGE_LOC));



	/* 3 (1) beacon */

	BufIndex = TxDescOffset;

	ConstructBeacon(padapter, &ReservedPagePacket[BufIndex], &BeaconLength);



	/*  When we count the first page size, we need to reserve description size for the RSVD */

	/*  packet, it will be filled in front of the packet in TXPKTBUF. */

	CurtPktPageNum = (u8)PageNum_128(TxDescLen + BeaconLength);

	/* If we don't add 1 more page, the WOWLAN function has a problem. Baron thinks it's a bug of firmware */

	if (CurtPktPageNum == 1)

		CurtPktPageNum += 1;

	TotalPageNum += CurtPktPageNum;



	BufIndex += (CurtPktPageNum*PageSize);



	/* 2 (4) probe response */

	RsvdPageLoc.LocProbeRsp = TotalPageNum;



	rtw_get_current_ip_address(padapter, currentip);



	ConstructProbeRsp(

		padapter,

		&ReservedPagePacket[BufIndex],

		&ProbeRspLength,

		currentip,

		false);

	rtl8723b_fill_fake_txdesc(padapter,

			&ReservedPagePacket[BufIndex-TxDescLen],

			ProbeRspLength,

			false, false, false);



	DBG_871X("%s(): HW_VAR_SET_TX_CMD: PROBE RSP %p %d\n",

		__func__, &ReservedPagePacket[BufIndex-TxDescLen],

		(ProbeRspLength+TxDescLen));



	CurtPktPageNum = (u8)PageNum_128(TxDescLen + ProbeRspLength);



	TotalPageNum += CurtPktPageNum;



	BufIndex += (CurtPktPageNum*PageSize);



	TotalPacketLen = BufIndex + ProbeRspLength;



	if (TotalPacketLen > MaxRsvdPageBufSize) {

		DBG_871X("%s(): ERROR: The rsvd page size is not enough \

				!!TotalPacketLen %d, MaxRsvdPageBufSize %d\n",

				__func__, TotalPacketLen, MaxRsvdPageBufSize);

		goto error;

	} else {

		/*  update attribute */

		pattrib = &pcmdframe->attrib;

		update_mgntframe_attrib(padapter, pattrib);

		pattrib->qsel = 0x10;

		pattrib->pktlen = TotalPacketLen - TxDescOffset;

		pattrib->last_txcmdsz = TotalPacketLen - TxDescOffset;

		dump_mgntframe_and_wait(padapter, pcmdframe, 100);

	}



	DBG_871X("%s: Set RSVD page location to Fw , TotalPacketLen(%d), TotalPageNum(%d)\n", __func__, TotalPacketLen, TotalPageNum);

	rtl8723b_set_ap_wow_rsvdpage_cmd(padapter, &RsvdPageLoc);



	return;

error:

	rtw_free_xmitframe(pxmitpriv, pcmdframe);

}

#endif /* CONFIG_AP_WOWLAN */



void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)

{

	struct hal_com_data	*pHalData = GET_HAL_DATA(padapter);

#ifdef CONFIG_AP_WOWLAN

	struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);

#endif

	struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);

	struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);

	bool bcn_valid = false;
@@ -1102,15 +770,8 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus) 
		DLBcnCount = 0;

		poll = 0;

		do {

#ifdef CONFIG_AP_WOWLAN

			if (pwrpriv->wowlan_ap_mode)

				rtl8723b_set_AP_FwRsvdPagePkt(padapter, 0);

			else

				rtl8723b_set_FwRsvdPagePkt(padapter, 0);

#else

			/*  download rsvd page. */

			rtl8723b_set_FwRsvdPagePkt(padapter, 0);

#endif

			DLBcnCount++;

			do {

				yield();

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

+0 −33
Original line number Diff line number Diff line
@@ -527,39 +527,6 @@ void rtl8723b_InitializeFirmwareVars(struct adapter *padapter) 
/* pHalData->H2CStopInsertQueue = false; */

}



#ifdef CONFIG_AP_WOWLAN

/*  */



/*  */

/*  Description: Prepare some information to Fw for WoWLAN. */

/* (1) Download wowlan Fw. */

/* (2) Download RSVD page packets. */

/* (3) Enable AP offload if needed. */

/*  */

/*  2011.04.12 by tynli. */

/*  */

void SetFwRelatedForWoWLAN8723b(

	struct adapter *padapter, u8 bHostIsGoingtoSleep

)

{

	int	status = _FAIL;

	/*  */

	/*  1. Before WoWLAN we need to re-download WoWLAN Fw. */

	/*  */

	status = rtl8723b_FirmwareDownload(padapter, bHostIsGoingtoSleep);

	if (status != _SUCCESS) {

		DBG_871X("SetFwRelatedForWoWLAN8723b(): Re-Download Firmware failed!!\n");

		return;

	} else {

		DBG_871X("SetFwRelatedForWoWLAN8723b(): Re-Download Firmware Success !!\n");

	}

	/*  */

	/*  2. Re-Init the variables about Fw related setting. */

	/*  */

	rtl8723b_InitializeFirmwareVars(padapter);

}

#endif /* CONFIG_AP_WOWLAN */



static void rtl8723b_free_hal_data(struct adapter *padapter)

{

}

drivers/staging/rtl8723bs/hal/sdio_halinit.c

+0 −105
Original line number Diff line number Diff line
@@ -1280,16 +1280,6 @@ static void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) 
{

	u8 val8;



#ifdef CONFIG_AP_WOWLAN

	struct wowlan_ioctl_param *poidparam;

	struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);

	int res;

	u32 tmp;

	u16 len = 0;

	u8 trycnt = 100;

	u32 himr = 0;

#endif



	switch (variable) {

	case HW_VAR_SET_RPWM:

		/*  rpwm value only use BIT0(clock bit) , BIT6(Ack bit), and BIT7(Toggle bit) */
@@ -1314,101 +1304,6 @@ static void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) 
		val8 = *val;

		break;



#ifdef CONFIG_AP_WOWLAN

	case HW_VAR_AP_WOWLAN:

	{

		poidparam = (struct wowlan_ioctl_param *)val;

		switch (poidparam->subcode) {

		case WOWLAN_AP_ENABLE:

			DBG_871X("%s, WOWLAN_AP_ENABLE\n", __func__);

			/*  1. Download WOWLAN FW */

			DBG_871X_LEVEL(_drv_always_, "Re-download WoWlan FW!\n");

			SetFwRelatedForWoWLAN8723b(padapter, true);



			/*  2. RX DMA stop */

			DBG_871X_LEVEL(_drv_always_, "Pause DMA\n");

			rtw_write32(padapter, REG_RXPKT_NUM,

				(rtw_read32(padapter, REG_RXPKT_NUM) | RW_RELEASE_EN));

			do {

				if ((rtw_read32(padapter, REG_RXPKT_NUM) & RXDMA_IDLE)) {

					DBG_871X_LEVEL(_drv_always_, "RX_DMA_IDLE is true\n");

					break;

				} else {

					/*  If RX_DMA is not idle, receive one pkt from DMA */

					res = sdio_local_read(padapter, SDIO_REG_RX0_REQ_LEN, 4, (u8 *)&tmp);

					len = le16_to_cpu(tmp);



					DBG_871X_LEVEL(_drv_always_, "RX len:%d\n", len);

					if (len > 0)

						res = RecvOnePkt(padapter, len);

					else

						DBG_871X_LEVEL(_drv_always_, "read length fail %d\n", len);



					DBG_871X_LEVEL(_drv_always_, "RecvOnePkt Result: %d\n", res);

				}

			} while (trycnt--);



			if (trycnt == 0)

				DBG_871X_LEVEL(_drv_always_, "Stop RX DMA failed......\n");



			/*  3. Clear IMR and ISR */

			DBG_871X_LEVEL(_drv_always_, "Clear IMR and ISR\n");

			tmp = 0;

			sdio_local_write(padapter, SDIO_REG_HIMR_ON, 4, (u8 *)&tmp);

			sdio_local_write(padapter, SDIO_REG_HIMR, 4, (u8 *)&tmp);

			sdio_local_read(padapter, SDIO_REG_HISR, 4, (u8 *)&tmp);

			sdio_local_write(padapter, SDIO_REG_HISR, 4, (u8 *)&tmp);



			/*  4. Enable CPWM2 only */

			DBG_871X_LEVEL(_drv_always_, "Enable only CPWM2\n");

			sdio_local_read(padapter, SDIO_REG_HIMR, 4, (u8 *)&tmp);

			DBG_871X("DisableInterruptButCpwm28723BSdio(): Read SDIO_REG_HIMR: 0x%08x\n", tmp);



			himr = cpu_to_le32(SDIO_HIMR_DISABLED) | SDIO_HIMR_CPWM2_MSK;

			sdio_local_write(padapter, SDIO_REG_HIMR, 4, (u8 *)&himr);



			sdio_local_read(padapter, SDIO_REG_HIMR, 4, (u8 *)&tmp);

			DBG_871X("DisableInterruptButCpwm28723BSdio(): Read again SDIO_REG_HIMR: 0x%08x\n", tmp);



			/*  5. Set Enable WOWLAN H2C command. */

			DBG_871X_LEVEL(_drv_always_, "Set Enable AP WOWLan cmd\n");

			rtl8723b_set_ap_wowlan_cmd(padapter, 1);

			/*  6. add some delay for H2C cmd ready */

			msleep(10);



			rtw_write8(padapter, REG_WOWLAN_WAKE_REASON, 0);

			break;

		case WOWLAN_AP_DISABLE:

			DBG_871X("%s, WOWLAN_AP_DISABLE\n", __func__);

			/*  1. Read wakeup reason */

			pwrctl->wowlan_wake_reason =

				rtw_read8(padapter, REG_WOWLAN_WAKE_REASON);



			DBG_871X_LEVEL(_drv_always_, "wakeup_reason: 0x%02x\n",

					pwrctl->wowlan_wake_reason);



			/*  2.  Set Disable WOWLAN H2C command. */

			DBG_871X_LEVEL(_drv_always_, "Set Disable WOWLan cmd\n");

			rtl8723b_set_ap_wowlan_cmd(padapter, 0);

			/*  6. add some delay for H2C cmd ready */

			msleep(2);



			DBG_871X_LEVEL(_drv_always_, "Release RXDMA\n");



			rtw_write32(padapter, REG_RXPKT_NUM,

				(rtw_read32(padapter, REG_RXPKT_NUM) & (~RW_RELEASE_EN)));



			SetFwRelatedForWoWLAN8723b(padapter, false);



		rtl8723b_set_FwJoinBssRpt_cmd(padapter, RT_MEDIA_CONNECT);

		issue_beacon(padapter, 0);

		break;

		default:

			break;

	}

}

	break;

#endif /* CONFIG_AP_WOWLAN */

	case HW_VAR_DM_IN_LPS:

		rtl8723b_hal_dm_in_lps(padapter);

		break;