Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cccd45f authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Remove mp( mesh point) mode support 



We've already removed non-standard ioctl handlers, used by driver
to support mp mode.

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0aba3f41

drivers/staging/rtl8188eu/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ r8188eu-y := \ 
		core/rtw_led.o		\

		core/rtw_mlme.o		\

		core/rtw_mlme_ext.o	\

		core/rtw_mp.o		\

		core/rtw_pwrctrl.o	\

		core/rtw_p2p.o		\

		core/rtw_recv.o		\
@@ -36,7 +35,6 @@ r8188eu-y := \ 
		hal/rtl8188e_cmd.o	\

		hal/rtl8188e_dm.o	\

		hal/rtl8188e_hal_init.o	\

		hal/rtl8188e_mp.o	\

		hal/rtl8188e_phycfg.o	\

		hal/rtl8188e_rf6052.o	\

		hal/rtl8188e_rxdesc.o	\

drivers/staging/rtl8188eu/core/rtw_cmd.c

+0 −5
Original line number Diff line number Diff line
@@ -738,8 +738,6 @@ void rtw_getbbrfreg_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *p 
	kfree(pcmd->parmbuf);

	kfree(pcmd);



	if (padapter->registrypriv.mp_mode == 1)

		padapter->mppriv.workparam.bcompleted = true;

}



void rtw_readtssi_cmdrsp_callback(struct adapter *padapter,  struct cmd_obj *pcmd)
@@ -747,9 +745,6 @@ void rtw_readtssi_cmdrsp_callback(struct adapter *padapter, struct cmd_obj *pcm 


	kfree(pcmd->parmbuf);

	kfree(pcmd);



	if (padapter->registrypriv.mp_mode == 1)

		padapter->mppriv.workparam.bcompleted = true;

}



u8 rtw_createbss_cmd(struct adapter  *padapter)

drivers/staging/rtl8188eu/core/rtw_mp.c

deleted100644 → 0
+0 −995

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8188eu/core/rtw_recv.c

+0 −27
Original line number Diff line number Diff line
@@ -789,10 +789,6 @@ int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame, 


	if (*psta == NULL) {

		RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under sta2sta_data_frame ; drop pkt\n"));

		if (adapter->registrypriv.mp_mode == 1) {

			if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)

			adapter->mppriv.rx_pktloss++;

		}

		ret = _FAIL;

		goto exit;

	}
@@ -2012,25 +2008,7 @@ static int recv_func_prehandle(struct adapter *padapter, 
			       struct recv_frame *rframe)

{

	int ret = _SUCCESS;

	struct rx_pkt_attrib *pattrib = &rframe->attrib;

	struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;



	if (padapter->registrypriv.mp_mode == 1) {

		if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)) { /* padapter->mppriv.check_mp_pkt == 0)) */

			if (pattrib->crc_err == 1)

				padapter->mppriv.rx_crcerrpktcount++;

			else

				padapter->mppriv.rx_pktcount++;



			if (check_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE) == false) {

				RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("MP - Not in loopback mode , drop pkt\n"));

				ret = _FAIL;

				rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */

				goto exit;

			}

		}

	}



	/* check the frame crtl field and decache */

	ret = validate_recv_frame(padapter, rframe);
@@ -2151,11 +2129,6 @@ s32 rtw_recv_entry(struct recv_frame *precvframe) 
	return ret;



_recv_entry_drop:



	if (padapter->registrypriv.mp_mode == 1)

		padapter->mppriv.rx_pktloss = precvpriv->rx_drop;





	return ret;

}

drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c

+0 −11
Original line number Diff line number Diff line
@@ -1258,7 +1258,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) 
{

	struct hal_data_8188e	*pHalData = GET_HAL_DATA(adapt);

	struct odm_dm_struct *dm_odm = &pHalData->odmpriv;

	struct mpt_context *pMptCtx = &(adapt->mppriv.MptCtx);

	s32 result[4][8];	/* last is final result */

	u8 i, final_candidate, Indexforchannel;

	bool pathaok, pathbok;
@@ -1278,11 +1277,6 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) 
	if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION))

		return;



	if (*(dm_odm->mp_mode) == 1) {

		singletone = pMptCtx->bSingleTone;

		carrier_sup = pMptCtx->bCarrierSuppression;

	}



	/*  20120213<Kordan> Turn on when continuous Tx to pass lab testing. (required by Edlu) */

	if (singletone || carrier_sup)

		return;
@@ -1410,12 +1404,7 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt) 
	u32 timeout = 2000, timecount = 0;

	struct hal_data_8188e *pHalData = GET_HAL_DATA(adapt);

	struct odm_dm_struct *dm_odm = &pHalData->odmpriv;

	struct mpt_context *pMptCtx = &(adapt->mppriv.MptCtx);



	if (*(dm_odm->mp_mode) == 1) {

		singletone = pMptCtx->bSingleTone;

		carrier_sup = pMptCtx->bCarrierSuppression;

	}

	if (!(dm_odm->SupportAbility & ODM_RF_CALIBRATION))

		return;

	/*  20120213<Kordan> Turn on when continuous Tx to pass lab testing. (required by Edlu) */