staging: rtl8723au: Fold rtw_ack_tx_done23a() into rtw23a_sctx_done_err()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/Makefile b/drivers/staging/rtl8723au/Makefile
index b184108..3e89890 100644 (file)
--- a/drivers/staging/rtl8723au/Makefile
+++ b/drivers/staging/rtl8723au/Makefile
@@ -32,7 +32,6 @@ r8723au-y :=                          \
                hal/rtl8723a_rf6052.o   \
                hal/rtl8723a_rxdesc.o   \
                hal/rtl8723a_sreset.o   \
-               hal/rtl8723a_xmit.o     \
                hal/rtl8723au_recv.o    \
                hal/rtl8723au_xmit.o    \
                hal/usb_halinit.o       \

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 044807c..01f1b79 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1048,6 +1048,21 @@ exit:
        return ret;
 }
 
+void handle_txrpt_ccx_8723a(struct rtw_adapter *adapter, void *buf)
+{
+       struct txrpt_ccx_8723a *txrpt_ccx = buf;
+       struct submit_ctx *pack_tx_ops = &adapter->xmitpriv.ack_tx_ops;
+
+       if (txrpt_ccx->int_ccx && adapter->xmitpriv.ack_tx) {
+               if (txrpt_ccx->pkt_ok)
+                       rtw23a_sctx_done_err(&pack_tx_ops,
+                                            RTW_SCTX_DONE_SUCCESS);
+               else
+                       rtw23a_sctx_done_err(&pack_tx_ops,
+                                            RTW_SCTX_DONE_CCX_PKT_FAIL);
+       }
+}
+
 void rtl8723a_InitAntenna_Selection(struct rtw_adapter *padapter)
 {
        u8 val;

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_xmit.c b/drivers/staging/rtl8723au/hal/rtl8723a_xmit.c
deleted file mode 100644 (file)
index 6ea2f9e..0000000
--- a/drivers/staging/rtl8723au/hal/rtl8723a_xmit.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2012 Realtek Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- ******************************************************************************/
-#define _RTL8723A_XMIT_C_
-
-#include <osdep_service.h>
-#include <drv_types.h>
-#include <rtl8723a_hal.h>
-
-void handle_txrpt_ccx_8723a(struct rtw_adapter *adapter, void *buf)
-{
-       struct txrpt_ccx_8723a *txrpt_ccx = buf;
-
-       if (txrpt_ccx->int_ccx) {
-               if (txrpt_ccx->pkt_ok)
-                       rtw_ack_tx_done23a(&adapter->xmitpriv, RTW_SCTX_DONE_SUCCESS);
-               else
-                       rtw_ack_tx_done23a(&adapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
-       }
-}

diff --cc drivers/staging/rtl8723au/include/rtw_xmit.h
Simple merge

diff --cc drivers/staging/rtl8723au/os_dep/usb_intf.c
Simple merge