diff --git a/htc/htc_api.h b/htc/htc_api.h index 67d9acaf18..f616e608a3 100644 --- a/htc/htc_api.h +++ b/htc/htc_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2014, 2016-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -171,10 +171,7 @@ struct htc_ep_callbacks { * indications (EpTxComplete must be NULL) */ HTC_EP_SEND_PKT_COMP_MULTIPLE EpTxCompleteMultiple; - /* OPTIONAL completion handler for multiple - * recv packet indications (EpRecv must be NULL) - */ - HTC_EP_RECV_PKT_MULTIPLE EpRecvPktMultiple; + HTC_EP_RESUME_TX_QUEUE ep_resume_tx_queue; /* if EpRecvAllocThresh is non-NULL, HTC will compare the * threshold value to the current recv packet length and invoke @@ -188,7 +185,6 @@ struct htc_ep_callbacks { * are empty */ int RecvRefillWaterMark; - }; /* service connection information */ diff --git a/htc/htc_recv.c b/htc/htc_recv.c index 6a96730438..f95c09e389 100644 --- a/htc/htc_recv.c +++ b/htc/htc_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -116,15 +116,6 @@ static void do_recv_completion(HTC_ENDPOINT *pEndpoint, } } -static void recv_packet_completion(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, - HTC_PACKET *pPacket) -{ - do_recv_completion_pkt(pEndpoint, pPacket); - - /* recover the packet container */ - free_htc_packet_container(target, pPacket); -} - void htc_control_rx_complete(void *Context, HTC_PACKET *pPacket) { /* TODO, can't really receive HTC control messages yet.... */ @@ -504,7 +495,11 @@ QDF_STATUS htc_rx_completion_handler(void *Context, qdf_nbuf_t netbuf, qdf_nbuf_pull_head(netbuf, HTC_HEADER_LEN); qdf_nbuf_set_pktlen(netbuf, pPacket->ActualLength); - recv_packet_completion(target, pEndpoint, pPacket); + do_recv_completion_pkt(pEndpoint, pPacket); + + /* recover the packet container */ + free_htc_packet_container(target, pPacket); + netbuf = NULL; } while (false);