Commit 116bf149 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3220b71

drivers/staging/rtl8723au/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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	\

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+15 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,21 @@ int c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt) 
	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;

drivers/staging/rtl8723au/hal/rtl8723a_xmit.c

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * 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);

	}

}

drivers/staging/rtl8723au/include/rtw_xmit.h

+0 −1
Original line number Diff line number Diff line
@@ -379,7 +379,6 @@ void xmit_delivery_enabled_frames23a(struct rtw_adapter *padapter, 
u8	qos_acm23a(u8 acm_mask, u8 priority);

u32	rtw_get_ff_hwaddr23a(struct xmit_frame	*pxmitframe);

int rtw_ack_tx_wait23a(struct xmit_priv *pxmitpriv, u32 timeout_ms);

void rtw_ack_tx_done23a(struct xmit_priv *pxmitpriv, int status);



/* include after declaring struct xmit_buf, in order to avoid warning */

#include <xmit_osdep.h>

drivers/staging/rtl8723au/os_dep/usb_intf.c

+3 −2
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ void rtl8723a_usb_intf_stop(struct rtw_adapter *padapter) 


static void rtw_dev_unload(struct rtw_adapter *padapter)

{

	struct submit_ctx *pack_tx_ops = &padapter->xmitpriv.ack_tx_ops;

	RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_dev_unload\n"));



	if (padapter->bup) {
@@ -249,7 +250,7 @@ static void rtw_dev_unload(struct rtw_adapter *padapter) 


		padapter->bDriverStopped = true;

		if (padapter->xmitpriv.ack_tx)

			rtw_ack_tx_done23a(&padapter->xmitpriv,

			rtw23a_sctx_done_err(&pack_tx_ops,

					     RTW_SCTX_DONE_DRV_STOP);



		/* s3. */