diff options
author | Ivan Safonov <insafonov@gmail.com> | 2016-09-18 13:24:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-20 07:33:48 -0400 |
commit | bc9886d32e631edf6db67feee195e6eed1a21786 (patch) | |
tree | 5227db87ad9fe34c56b54b44bf4645864c53d4e0 /drivers/staging | |
parent | 43969aa7e8506765412087f5c1fc5ae4f0fe5d9a (diff) |
staging: r8188eu: remove xmitframe_direct function
xmitframe_direct is a simple wrapper around
rtw_xmitframe_coalesce and rtw_dump_xframe functions.
Many wrappers complicates code reading.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c index 5482f479907c..169d6c842dc2 100644 --- a/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | |||
@@ -605,18 +605,6 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitp | |||
605 | return true; | 605 | return true; |
606 | } | 606 | } |
607 | 607 | ||
608 | static s32 xmitframe_direct(struct adapter *adapt, struct xmit_frame *pxmitframe) | ||
609 | { | ||
610 | s32 res; | ||
611 | |||
612 | res = rtw_xmitframe_coalesce(adapt, pxmitframe->pkt, pxmitframe); | ||
613 | if (res == _SUCCESS) | ||
614 | rtw_dump_xframe(adapt, pxmitframe); | ||
615 | else | ||
616 | DBG_88E("==> %s xmitframe_coalsece failed\n", __func__); | ||
617 | return res; | ||
618 | } | ||
619 | |||
620 | /* | 608 | /* |
621 | * Return | 609 | * Return |
622 | * true dump packet directly | 610 | * true dump packet directly |
@@ -648,7 +636,12 @@ s32 rtw_hal_xmit(struct adapter *adapt, struct xmit_frame *pxmitframe) | |||
648 | pxmitframe->buf_addr = pxmitbuf->pbuf; | 636 | pxmitframe->buf_addr = pxmitbuf->pbuf; |
649 | pxmitbuf->priv_data = pxmitframe; | 637 | pxmitbuf->priv_data = pxmitframe; |
650 | 638 | ||
651 | if (xmitframe_direct(adapt, pxmitframe) != _SUCCESS) { | 639 | res = rtw_xmitframe_coalesce(adapt, pxmitframe->pkt, pxmitframe); |
640 | |||
641 | if (res == _SUCCESS) { | ||
642 | rtw_dump_xframe(adapt, pxmitframe); | ||
643 | } else { | ||
644 | DBG_88E("==> %s xmitframe_coalsece failed\n", __func__); | ||
652 | rtw_free_xmitbuf(pxmitpriv, pxmitbuf); | 645 | rtw_free_xmitbuf(pxmitpriv, pxmitbuf); |
653 | rtw_free_xmitframe(pxmitpriv, pxmitframe); | 646 | rtw_free_xmitframe(pxmitpriv, pxmitframe); |
654 | } | 647 | } |