diff options
| -rw-r--r-- | htc/htc_api.h | 26 | ||||
| -rw-r--r-- | htc/htc_recv.c | 8 | ||||
| -rw-r--r-- | qdf/inc/qdf_types.h | 11 | ||||
| -rw-r--r-- | wmi/src/wmi_unified.c | 1 |
4 files changed, 13 insertions, 33 deletions
diff --git a/htc/htc_api.h b/htc/htc_api.h index c129f4295d0c..7376731779bc 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. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -443,18 +443,6 @@ QDF_STATUS htc_wait_target(HTC_HANDLE HTCHandle); QDF_STATUS htc_start(HTC_HANDLE HTCHandle); /** - * htc_add_receive_pkt - Add receive packet to HTC - * @HTCHandle - HTC handle - * @pPacket - HTC receive packet to add - * - * User must supply HTC packets for capturing incoming HTC frames. - * The caller must initialize each HTC packet using the - * SET_HTC_PACKET_INFO_RX_REFILL() macro. - * Return: A_OK on success - */ -A_STATUS htc_add_receive_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket); - -/** * htc_connect_service - Connect to an HTC service * @HTCHandle - HTC handle * @pReq - connection details @@ -696,18 +684,6 @@ struct ol_ath_htc_stats *ieee80211_ioctl_get_htc_stats(HTC_HANDLE */ int htc_get_tx_queue_depth(HTC_HANDLE *htc_handle, HTC_ENDPOINT_ID endpoint_id); -#ifdef HIF_USB -#define HTCReturnReceivePkt(target, p, osbuf) \ - do { \ - A_NETBUF_FREE(osbuf); \ - if (p->Status == A_CLONE) { \ - qdf_mem_free(p); \ - } \ - } while (0) -#else -#define HTCReturnReceivePkt(target, p, osbuf) htc_add_receive_pkt(target, p) -#endif - #ifdef WLAN_FEATURE_FASTPATH void htc_ctrl_msg_cmpl(HTC_HANDLE htc_pdev, HTC_ENDPOINT_ID htc_ep_id); diff --git a/htc/htc_recv.c b/htc/htc_recv.c index e76dea089b8d..bc6bf711d46f 100644 --- a/htc/htc_recv.c +++ b/htc/htc_recv.c @@ -566,14 +566,6 @@ A_STATUS htc_add_receive_pkt_multiple(HTC_HANDLE HTCHandle, return status; } -A_STATUS htc_add_receive_pkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket) -{ - HTC_PACKET_QUEUE queue; - - INIT_HTC_PACKET_QUEUE_AND_ADD(&queue, pPacket); - return htc_add_receive_pkt_multiple(HTCHandle, &queue); -} - void htc_flush_rx_hold_queue(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint) { HTC_PACKET *pPacket; diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h index cb6b2d337393..616b9bcf05de 100644 --- a/qdf/inc/qdf_types.h +++ b/qdf/inc/qdf_types.h @@ -469,6 +469,15 @@ void qdf_vtrace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level, * restart of SAP * @QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL: Switch using fav channel(s) * without SAP restart + * @QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION:**Not In Use** + * Force switch without SAP restart. MCC is allowed only in below exception + * cases: + * Exception Case-1: When STA is operating on DFS channel. + * Exception Case-2: When STA is operating on LTE-CoEx channel. + * Exception Case-3: When STA is operating on AP disabled channel. + * @QDF_MCC_TO_SCC_WITH_PREFERRED_BAND: Force SCC only in user preferred band. + * Allow MCC if STA is operating or comes up on other than user preferred band. + * * @QDF_MCC_TO_SCC_SWITCH_MAX: max switch */ typedef enum { @@ -477,6 +486,8 @@ typedef enum { QDF_MCC_TO_SCC_SWITCH_FORCE, QDF_MCC_TO_SCC_SWITCH_FORCE_WITHOUT_DISCONNECTION, QDF_MCC_TO_SCC_SWITCH_WITH_FAVORITE_CHANNEL, + QDF_MCC_TO_SCC_SWITCH_FORCE_PREFERRED_WITHOUT_DISCONNECTION, + QDF_MCC_TO_SCC_WITH_PREFERRED_BAND, QDF_MCC_TO_SCC_SWITCH_MAX } tQDF_MCC_TO_SCC_SWITCH_MODE; #endif diff --git a/wmi/src/wmi_unified.c b/wmi/src/wmi_unified.c index b774a782f577..d9f128dbba10 100644 --- a/wmi/src/wmi_unified.c +++ b/wmi/src/wmi_unified.c @@ -1322,6 +1322,7 @@ QDF_STATUS wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, return QDF_STATUS_E_NOMEM; } + qdf_mem_zero(qdf_nbuf_data(buf), sizeof(WMI_CMD_HDR)); WMI_SET_FIELD(qdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id); qdf_atomic_inc(&wmi_handle->pending_cmds); |