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

Commit b3a4942f authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: rename pre_xmitframe to rtw_hal_xmit 



And remove many one-line wrappers.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61a30f36

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -162,14 +162,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *adapt) 
	return _FAIL;

	return _FAIL;

}

}





s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe)

{

	if (adapt->HalFunc.hal_xmit)

		return adapt->HalFunc.hal_xmit(adapt, pxmitframe);



	return false;

}



s32 rtw_hal_init_xmit_priv(struct adapter *adapt)

s32 rtw_hal_init_xmit_priv(struct adapter *adapt)

{

{

	if (adapt->HalFunc.init_xmit_priv)

	if (adapt->HalFunc.init_xmit_priv)

drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -622,7 +622,7 @@ static s32 xmitframe_direct(struct adapter *adapt, struct xmit_frame *pxmitframe 
 *	true	dump packet directly

 *	true	dump packet directly

 *	false	enqueue packet

 *	false	enqueue packet

 */

 */

static s32 pre_xmitframe(struct adapter *adapt, struct xmit_frame *pxmitframe)

s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe)

{

{

	s32 res;

	s32 res;

	struct xmit_buf *pxmitbuf = NULL;

	struct xmit_buf *pxmitbuf = NULL;
@@ -679,13 +679,3 @@ s32 rtw_hal_mgnt_xmit(struct adapter *adapt, struct xmit_frame *pmgntframe) 
	rtl88eu_mon_xmit_hook(adapt->pmondev, pmgntframe, xmitpriv->frag_len);

	rtl88eu_mon_xmit_hook(adapt->pmondev, pmgntframe, xmitpriv->frag_len);

	return rtw_dump_xframe(adapt, pmgntframe);

	return rtw_dump_xframe(adapt, pmgntframe);

}
 
}
 


/*

 * Return

 *	true	dump packet directly ok

 *	false	temporary can't transmit packets to hardware

 */

s32 rtl8188eu_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe)

{

	return pre_xmitframe(adapt, pxmitframe);

}

drivers/staging/rtl8188eu/hal/usb_halinit.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -2087,7 +2087,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) 
	halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;

	halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;

	halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;

	halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb;





	halfunc->hal_xmit = &rtl8188eu_hal_xmit;



	rtl8188e_set_hal_ops(halfunc);

	rtl8188e_set_hal_ops(halfunc);

}
 
}

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -199,8 +199,6 @@ struct hal_ops { 
	void	(*AntDivCompareHandler)(struct adapter *adapter,

	void	(*AntDivCompareHandler)(struct adapter *adapter,

					struct wlan_bssid_ex *dst,

					struct wlan_bssid_ex *dst,

					struct wlan_bssid_ex *src);

					struct wlan_bssid_ex *src);

	s32	(*hal_xmit)(struct adapter *padapter,

			    struct xmit_frame *pxmitframe);

	u32	(*read_rfreg)(struct adapter *padapter,

	u32	(*read_rfreg)(struct adapter *padapter,

			      enum rf_radio_path eRFPath, u32 RegAddr,

			      enum rf_radio_path eRFPath, u32 RegAddr,

			      u32 BitMask);

			      u32 BitMask);

drivers/staging/rtl8188eu/include/rtl8188e_xmit.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,6 @@ struct txrpt_ccx_88e { 
void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc,

void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc,

			       u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull);

			       u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull);

s32 rtl8188eu_init_xmit_priv(struct adapter *padapter);

s32 rtl8188eu_init_xmit_priv(struct adapter *padapter);

s32 rtl8188eu_hal_xmit(struct adapter *padapter, struct xmit_frame *frame);

s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);

s32 rtl8188eu_xmit_buf_handler(struct adapter *padapter);

#define hal_xmit_handler rtl8188eu_xmit_buf_handler

#define hal_xmit_handler rtl8188eu_xmit_buf_handler

void rtl8188eu_xmit_tasklet(void *priv);

void rtl8188eu_xmit_tasklet(void *priv);