diff options
author | Ivan Safonov | 2016-09-03 17:31:36 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2016-09-12 11:23:22 +0200 |
commit | b3a4942fbcaecf1f8e83aa88668a283c49c0c6d7 (patch) | |
tree | d762b0871a28de4a3510c1c1bf28a5015dfac1b7 /drivers | |
parent | staging: r8188eu: rename rtl8188eu_mgnt_xmit to rtw_hal_mgnt_xmit (diff) | |
download | kernel-qcow2-linux-b3a4942fbcaecf1f8e83aa88668a283c49c0c6d7.tar.gz kernel-qcow2-linux-b3a4942fbcaecf1f8e83aa88668a283c49c0c6d7.tar.xz kernel-qcow2-linux-b3a4942fbcaecf1f8e83aa88668a283c49c0c6d7.zip |
staging: r8188eu: rename pre_xmitframe to rtw_hal_xmit
And remove many one-line wrappers.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rtl8188eu/hal/hal_intf.c | 8 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 12 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/hal/usb_halinit.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/include/hal_intf.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 1 |
5 files changed, 1 insertions, 24 deletions
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c index 57452306124c..18b43aa837d3 100644 --- a/drivers/staging/rtl8188eu/hal/hal_intf.c +++ b/drivers/staging/rtl8188eu/hal/hal_intf.c @@ -162,14 +162,6 @@ u32 rtw_hal_inirp_deinit(struct adapter *adapt) 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) { if (adapt->HalFunc.init_xmit_priv) diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c index 48386d054f93..f2c8f7a2c64e 100644 --- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c @@ -622,7 +622,7 @@ static s32 xmitframe_direct(struct adapter *adapt, struct xmit_frame *pxmitframe * true dump packet directly * 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; 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); 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); -} diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c index a99d316e4238..f7ac68bc5ee9 100644 --- a/drivers/staging/rtl8188eu/hal/usb_halinit.c +++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c @@ -2087,7 +2087,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb; halfunc->SetBeaconRelatedRegistersHandler = &SetBeaconRelatedRegisters8188EUsb; - halfunc->hal_xmit = &rtl8188eu_hal_xmit; - rtl8188e_set_hal_ops(halfunc); } diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h index bb61a0fde83c..5b882f6b5ac1 100644 --- a/drivers/staging/rtl8188eu/include/hal_intf.h +++ b/drivers/staging/rtl8188eu/include/hal_intf.h @@ -199,8 +199,6 @@ struct hal_ops { void (*AntDivCompareHandler)(struct adapter *adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src); - s32 (*hal_xmit)(struct adapter *padapter, - struct xmit_frame *pxmitframe); u32 (*read_rfreg)(struct adapter *padapter, enum rf_radio_path eRFPath, u32 RegAddr, u32 BitMask); diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h index b9ebb6607b04..66205b782721 100644 --- a/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h +++ b/drivers/staging/rtl8188eu/include/rtl8188e_xmit.h @@ -154,7 +154,6 @@ struct txrpt_ccx_88e { void rtl8188e_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull); 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); #define hal_xmit_handler rtl8188eu_xmit_buf_handler void rtl8188eu_xmit_tasklet(void *priv); |