Commit 34156322 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove mgnt_xmit from struct hal_ops 



Remove mgnt_xmit from struct hal_ops and its wrapper
rtw_hal_mgnt_xmit(). Call rtl8188eu_mgnt_xmit() directly instead.

Acked-by: default avatarFabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210910205033.3778-2-straube.linux@gmail.com


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+3 −3
Original line number Diff line number Diff line
@@ -4258,7 +4258,7 @@ void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe) 
	if (padapter->bSurpriseRemoved || padapter->bDriverStopped)

		return;



	rtw_hal_mgnt_xmit(padapter, pmgntframe);

	rtl8188eu_mgnt_xmit(padapter, pmgntframe);

}



s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntframe, int timeout_ms)
@@ -4273,7 +4273,7 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr 
	rtw_sctx_init(&sctx, timeout_ms);

	pxmitbuf->sctx = &sctx;



	ret = rtw_hal_mgnt_xmit(padapter, pmgntframe);

	ret = rtl8188eu_mgnt_xmit(padapter, pmgntframe);



	if (ret == _SUCCESS)

		ret = rtw_sctx_wait(&sctx);
@@ -4294,7 +4294,7 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg 
	pxmitpriv->ack_tx = true;



	pmgntframe->ack_report = 1;

	if (rtw_hal_mgnt_xmit(padapter, pmgntframe) == _SUCCESS) {

	if (rtl8188eu_mgnt_xmit(padapter, pmgntframe) == _SUCCESS) {

		ret = rtw_ack_tx_wait(pxmitpriv, timeout_ms);

	}

drivers/staging/r8188eu/core/rtw_mp.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ void PhySetTxPowerLevel(struct adapter *pAdapter) 
/*  */

static void dump_mpframe(struct adapter *padapter, struct xmit_frame *pmpframe)

{

	rtw_hal_mgnt_xmit(padapter, pmpframe);

	rtl8188eu_mgnt_xmit(padapter, pmpframe);

}



static struct xmit_frame *alloc_mp_xmitframe(struct xmit_priv *pxmitpriv)

drivers/staging/r8188eu/hal/hal_intf.c

+0 −8
Original line number Diff line number Diff line
@@ -96,14 +96,6 @@ s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe) 
	return false;

}



s32 rtw_hal_mgnt_xmit(struct adapter *adapt, struct xmit_frame *pmgntframe)

{

	s32 ret = _FAIL;

	if (adapt->HalFunc.mgnt_xmit)

		ret = adapt->HalFunc.mgnt_xmit(adapt, pmgntframe);

	return ret;

}



s32 rtw_hal_init_xmit_priv(struct adapter *adapt)

{

	if (adapt->HalFunc.init_xmit_priv)

drivers/staging/r8188eu/hal/rtl8188e_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void SetFwRsvdPagePkt(struct adapter *adapt, bool bDLFinished) 
	pattrib->pktlen = pattrib->last_txcmdsz;

	memcpy(pmgntframe->buf_addr, ReservedPagePacket, TotalPacketLen);



	rtw_hal_mgnt_xmit(adapt, pmgntframe);

	rtl8188eu_mgnt_xmit(adapt, pmgntframe);



	DBG_88E("%s: Set RSVD page location to Fw\n", __func__);

	FillH2CCmd_88E(adapt, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8 *)&RsvdPageLoc);

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −1
Original line number Diff line number Diff line
@@ -2229,7 +2229,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb;



	halfunc->hal_xmit = &rtl8188eu_hal_xmit;

	halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit;



	rtl8188e_set_hal_ops(halfunc);

}